home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,457 Commits 48 Branches 340 Tags
dffacbb12c0abd4edf677aed2d9e201b41fd2dae
Commit Graph
6225 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 0ea5d764f2 Hide the link for spam logs if the Askimet is disabled 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 718b1dddfe Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 62cad887ea Use time_ago_with_tooltip on spam logs list 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 64c9768bd6 Use truncate helper on spam logs list 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images 
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
 2016-02-01 18:25:32 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05:00
Robert Speicher 5d4f8012f6 Merge branch 'rename-inline-diff' into 'master' 
Mark inline difference between old and new paths when a file is renamed

See merge request !2652
 2016-01-31 03:04:33 +00:00
Douwe Maan 3d61cf9f1b Merge branch 'warn-admin-oauth' into 'master' 
Warn admin of granting admin rights during OAuth

Fixes #3951

Warning style the same as the warning a user sees on a archived project.



![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png)


See merge request !2601
 2016-01-30 10:03:40 +00:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Jacob Schatz b4b41b4ca6 Merge branch 'focus-emoji-search-field' into 'master' 
Auto-focus emoji award search field

![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif)

Closes #12621 

cc. @jschatz1 

See merge request !2650
 2016-01-29 15:27:24 +00:00
Phil Hughes 1b97872793 Auto-focus emoji award search field 
Closes #12621
 2016-01-29 12:15:58 +00:00
Robert Speicher ca05054ea2 Partially revert "Add IP check against DNSBLs at account sign-up" 
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
 2016-01-28 16:28:19 -05:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master' 
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
 2016-01-27 21:20:16 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Douwe Maan 4be80f8aa3 Fix highlighting in blame view. 2016-01-27 16:15:24 +01:00
Yorick Peterse de7c9c7ab1 Use Atom update times of the first event 
By simply loading the first event from the already sorted set we save
ourselves extra (slow) queries just to get the latest update timestamp.
This removes the need for Event.latest_update_time and significantly
reduces the time needed to build an Atom feed.

Fixes gitlab-org/gitlab-ce#12415
 2016-01-27 10:33:33 +01:00
Kamil Trzciński 5e0ee54c6c Merge branch 'fix/commit-status-artifacts' into 'master' 
Use generic method to checks if artifacts are available

Closes #12626

See merge request !2576
 2016-01-27 09:07:47 +00:00
Zeger-Jan van de Weg 103d67768d Improve text on warning message 2016-01-26 16:56:34 +01:00
Zeger-Jan van de Weg 758177d14c Warn admin of granting admin rights during OAuth 
Fixes #3951

Warning style the same as the warning a user sees on a archived project.
 2016-01-26 16:56:34 +01:00
Zeger-Jan van de Weg c10296f92d Fix visibility level texts on application settings 
Introduced by me through !2005
 2016-01-26 14:54:35 +01:00
Zeger-Jan van de Weg 89154880e5 Save button on app settings now btn-save 2016-01-26 10:05:28 +01:00
Grzegorz Bizon 8d397862cd Use generic method to checks if artifacts are available 2016-01-26 08:34:48 +01:00
Robert Speicher 68ad3180b3 Merge branch 'note-highlighting' into 'master' 
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
 2016-01-25 23:43:44 +00:00
Jose Torres 26e31f5820 Substituted deprecated forum link with project issues link. [ci skip] 2016-01-25 13:10:11 -06:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Jacob Schatz c10705c59f Distinguishes between search inputs. 
Main search input has different styles than secondary search inputs.
 2016-01-24 20:20:03 -05:00
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -05:00
Robert Speicher 0ae588255c Remove link from system hook 
Closes #12672
 2016-01-24 15:27:50 -08:00
Jacob Schatz 0ee2d50eee Merge branch 'issuable-white-bg' into 'master' 
Remove gray background from issue/mr/milestone background

Fixes #6062 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
cc @skyruler @creamzy 

See merge request !2573
 2016-01-23 05:41:00 +00:00
Dmitriy Zaporozhets 367cd8ac75 Remove gray background from issue/mr/milestone background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 16:15:32 -08:00
Dmitriy Zaporozhets cf673ba9f6 Fix UI for pages with panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:37:40 -08:00
Dmitriy Zaporozhets b0fff566c9 Merge branch 'issue_2239' into 'master' 
Provide a link for fetching merge requests from command line instructions

Closes #2239 

See merge request !2540
 2016-01-22 20:00:34 +00:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Dmitriy Zaporozhets 406c912496 Merge branch 'fix-error-500-mr-search' into 'master' 
Fix Error 500 when doing a search for merge requests

Potential fix for #11547

See merge request !2525
 2016-01-22 18:14:10 +00:00
Robert Speicher 5f0d7e2e3b Merge branch 'fix-mr-diff-edit-button' into 'master' 
Fix MR diff 'Edit' button

It now works and has the right size.

See merge request !2542
 2016-01-22 07:39:33 +00:00
Robert Speicher 2fed8bf390 Merge branch 'fix-diff-comments' into 'master' 
More highlighted diff fixes

See merge request !2545
 2016-01-22 07:37:47 +00:00
Douwe Maan 16d17b78ca Restore diff comments 2016-01-22 02:10:58 +01:00
Robert Speicher 3f5e6c6cf6 Merge branch 'ci/recursive-artifacts-entries' into 'master' 
Add method to calculate total size of artifacts in subpath

See merge request !2500
 2016-01-21 23:23:02 +00:00
Robert Speicher 307b099064 Merge branch 'diff-highlight-themes' into 'master' 
Diff highlight themes

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484

See merge request !2530
 2016-01-21 23:16:22 +00:00
Douwe Maan 9369b7ec1f Fix MR diff 'Edit' button 2016-01-21 22:46:49 +01:00
Rubén Dávila 46c7691633 Add link for checkout MRs info. 2016-01-21 16:09:44 -05:00
Grzegorz Bizon 66b0927bb5 Move build artifacts javascripts into separate file 2016-01-21 15:51:44 +01:00
Grzegorz Bizon e5232ccc1e Do not use progress bar when downloading build artifacts 
Closes #12491
 2016-01-21 15:06:32 +01:00
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00