Commit Graph
6206 Commits
Author SHA1 Message Date
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
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
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 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
Stan Hu f121d2d8f8 Fix Error 500 when doing a search for merge requests
Potential fix for #11547
2016-01-20 23:48:56 -08:00
Dmitriy ZaporozhetsandJacob Schatz 8367e4abeb Implement new UI for pagination 2016-01-20 21:27:01 -05:00
Dmitriy Zaporozhets 1667d2134c Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master'
Adds disabled comment field and disabled avatar.

Fixes #3540

![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png)


See merge request !2508
2016-01-20 22:27:40 +00:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Rémy Coutable 12da27090f Address some JS coding-style and HTML semantic issues
- Replace 'rel' attributes with 'data' or 'id' attributes
- Style jQuery methods chaining according to Jacob's guidelines
- Rename a method
2016-01-20 22:39:32 +01:00
Kamil Trzcinski 9b0f57781e Add method that calculates total size for artifacts subfolder 2016-01-20 21:55:13 +01:00
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455

References #9092

See merge request !2515
2016-01-20 14:24:20 -05:00
Douwe Maan 7d347ae564 Merge branch 'master' into issue_3945 2016-01-20 20:04:15 +01:00
Robert Speicher e3c43ca7d0 Merge branch 'sentry-integration' into 'master'
Add sentry integration

Sentry is an event logging platform primarily focused on capturing and
aggregating exceptions. With this MR it will be possible to log and
track exceptions from GitLab to Sentry.

https://gitlab.com/gitlab-com/operations/issues/39

See merge request !2485
2016-01-20 19:00:35 +00:00
Douwe Maan 0e992a3b4e Properly highlight lines around '\ No newline at end of file' 2016-01-20 19:20:13 +01:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere



See merge request !2507
2016-01-20 16:39:43 +00:00
Jacob Schatz 7377abf84a Simplifies the HAML if statement for project branch URL 2016-01-20 10:50:26 -05:00
Douwe Maan 7838c957c2 Target '_blank' 2016-01-20 16:18:42 +01:00
Douwe Maan 987e3d94b0 Fix MR diff_refs 2016-01-20 15:40:49 +01:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00
Douwe Maan 701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Jeroen Nijhof 7a609858f0 Use sentry in env production only 2016-01-20 09:48:38 +01:00