summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Add note of deprecation in old Runners CI APIAchilleas Pipinellis2016-02-191-1/+4
| | | | | | | |
| * | | | | | | Add runners API documentation [ci-skip]Tomasz Maczukin2016-02-192-0/+235
| | | | | | | |
| * | | | | | | Fix runners filtering in APITomasz Maczukin2016-02-192-20/+27
| | | | | | | |
| * | | | | | | Add missing methods documentation; fix rubocop reported violationTomasz Maczukin2016-02-191-1/+36
| | | | | | | |
| * | | | | | | Add feature to enable/disable runner in projectTomasz Maczukin2016-02-192-0/+128
| | | | | | | |
| * | | | | | | Add basic runners management APITomasz Maczukin2016-02-195-0/+398
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner
* | | | | | | | Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put project visibility icon next to title Fixes #11872 See merge request !2885
| * | | | | | | Move visibility icon next to project titleissue_11872Alfredo Sumaran2016-02-182-17/+13
| |/ / / / / /
* | | | | | | Merge branch 'web_editor' into 'master' Achilleas Pipinellis2016-02-1917-16/+110
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update web editor documentation Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 Closes #4262 See merge request !2776
| * | | | | | Update web editor documentationweb_editorAchilleas Pipinellis2016-02-1017-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 [ci skip]
* | | | | | | Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-192-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
| * | | | | | | Project limit is reached warning is hidden when the projects_limit is zeroZeger-Jan van de Weg2016-02-192-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #12791
* | | | | | | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-1913-3113/+20165
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * | | | | | | Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| | | | | | | |
| * | | | | | | Update fixtures/emojis/aliases.jsonRobert Speicher2016-02-152-3/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a script to re-generate them from the index.
| * | | | | | | Update fixtures/emojis/index.jsonRobert Speicher2016-02-151-1823/+18276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current as of Gemojione 2.2.1 - https://git.io/vgQx0
| * | | | | | | Fix specs expecting `emoji/` in image pathRobert Speicher2016-02-132-3/+3
| | | | | | | |
| * | | | | | | Update Emoji asset pathRobert Speicher2016-02-123-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
| * | | | | | | Update gitlab_emoji to ~> 0.3.0Robert Speicher2016-02-122-5/+5
| | | | | | | |
| * | | | | | | Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
| | | | | | | |
* | | | | | | | Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-193-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
| * | | | | | | | update based on feedbackJames Lopez2016-02-192-2/+2
| | | | | | | | |
| * | | | | | | | updated fix based on MR feedbackJames Lopez2016-02-175-11/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-1751-261/+743
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-forks-page
| * | | | | | | | | workaround for forks with an invalid repo - avoid showing them in the listJames Lopez2016-02-163-1/+21
| | | | | | | | | |
* | | | | | | | | | Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-192-9/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
| * | | | | | | | | | Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-labelRobert Speicher2016-02-182-9/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_with_delimiter() added See merge request !2886
| * | | | | | | | | | number_with_delimiter() addedheiko2016-02-191-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug found by Charles Sibbald at Sky. Calls with patricio and Jacob confirmed this. [ci skip] See merge request !2877
| * | | | | | | | | | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob ↵Richard Pidgeon2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmed this
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-21/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No changes to nginx config in this update. Removed unnecessary instructions. [ci skip] See merge request !2879
| * | | | | | | | | | | No changes to nginx config in this update. Removed unnecessary instructions.Brandon Patton2016-02-181-21/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'revert-2782' into 'master' Douwe Maan2016-02-188-378/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'saml-decoupling' into 'master'" This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9. Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2782 See merge request !2878
| * | | | | | | | | | | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-188-378/+27
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* | | | | | | | | | | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add release tracking for Sentry See merge request !2863
| * | | | | | | | | | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-188-27/+378
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782
| * | | | | | | | | | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-188-27/+378
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-182-5/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SCAN during 'rake cache:clear' This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. See merge request !2872
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1864-208/+777
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | cache-clear
| * | | | | | | | | | | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-182-5/+18
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway.
* | | | | | | | | | | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-182-11/+71
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
| * | | | | | | | | | Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-182-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If path_with_namespace is nil Repository#raw_repository will also return nil. Apparently code out there creates a Repository instance without a namespace path. Right.
| * | | | | | | | | | Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just checking raw_repository is no longer accurate to determine if a repository exists or not.
| * | | | | | | | | | Added specs for Repository#exists?Yorick Peterse2016-02-181-0/+13
| | | | | | | | | | |
| * | | | | | | | | | Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Repository#raw_repository no longer sets the autocrlf option it will also no longer raise any NoRepository errors since it doesn't access Rugged any more. This also means that Repository#exists? can't simply return the raw repository as this is no indication of whether or not the repository actually exists (besides returning a non boolean is weird in the first place). To solve this problem Repository#exists? now properly checks if the repository exists and returns true/false instead of a Gitlab::Git::Repository or nil object.
| * | | | | | | | | | Only set autocrlf when creating/updating filesYorick Peterse2016-02-182-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the "autocrlf" Git option is an overkill since it's rarely actually needed. More importantly, it has quite the impact on performance (see gitlab-org/gitlab-ce#13457 for more information). By setting "autocrlf" when creating or updating files we guarantee the option is always set properly when we actually need it _without_ introducing overhead for requests that have nothing to do with this option. Fixes gitlab-org/gitlab-ce#13457
* | | | | | | | | | | Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses cross browser niceScroll to do scrolling on sidebar. Fixes: #13544 Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. This also leaves the default scrollbar as is. ![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png) Also fixes horz scroll issue: ![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png) cc @creamzy @dzaporozhets See merge request !2873
| * | | | | | | | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
|/ / / / / / / / / /