summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor authorization_for_merge_requests.md21857-refactor-merge-requests-documentationAchilleas Pipinellis2016-09-051-16/+32
|
* Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-055-34/+128
|
* Move merge request versions to its own documentAchilleas Pipinellis2016-09-053-5/+23
|
* Move "Only allow merge requests to be merged if the build succeeds" to new ↵Achilleas Pipinellis2016-09-055-13/+21
| | | | location
* Move revert_changes.md to new locationAchilleas Pipinellis2016-09-057-65/+66
|
* Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-057-53/+54
|
* Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-056-14/+19
|
* Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-054-15/+29
|
* Move authorization_for_merge_requests.md to new locationAchilleas Pipinellis2016-09-052-40/+41
|
* Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-058-91/+92
|
* Merge branch 'zj-add-link-docs-index' into 'master' Achilleas Pipinellis2016-09-041-1/+2
|\ | | | | | | | | | | | | Add link on API docs index page See merge request !6190
| * Add link on API docs index pagezj-add-link-docs-indexZ.J. van de Weg2016-09-031-1/+2
| | | | | | | | [ci skip]
* | Merge branch 'fix-spec-failures-diff-spec' into 'master' Stan Hu2016-09-041-0/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix randomly failing specs in expand_collapse_diff_spec: This MR fixes the following random failure in a spec: ``` Failure/Error: namespace.human_name + ' / ' + name ActionView::Template::Error: undefined method `+' for nil:NilClass # ./app/models/project.rb:807:in `name_with_namespace' # ./app/views/layouts/project.html.haml:1:in `_app_views_layouts_project_html_haml___2918737809244135908_70160161538920 ' # ./app/controllers/projects/commit_controller.rb:23:in `show' # ./lib/gitlab/request_profiler/middleware.rb:15:in `call' # ./lib/gitlab/middleware/go.rb:16:in `call' # ./lib/gitlab/middleware/static.rb:9:in `call' # ------------------ # --- Caused by: --- # NoMethodError: # undefined method `+' for nil:NilClass # ./app/models/project.rb:807:in `name_with_namespace' ``` Capybara's `click_link` method doesn't actually wait for the page to reload. When the `expand_all_diffs` parameter is used, we need to search for unique elements that appear to ensure that the page has actually reloaded. Closes #21841 See merge request !6193
| * Fix randomly failing specs in expand_collapse_diff_spec:Stan Hu2016-09-031-0/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Failure/Error: namespace.human_name + ' / ' + name ActionView::Template::Error: undefined method `+' for nil:NilClass # ./app/models/project.rb:807:in `name_with_namespace' # ./app/views/layouts/project.html.haml:1:in `_app_views_layouts_project_html_haml___2918737809244135908_70160161538920 ' # ./app/controllers/projects/commit_controller.rb:23:in `show' # ./lib/gitlab/request_profiler/middleware.rb:15:in `call' # ./lib/gitlab/middleware/go.rb:16:in `call' # ./lib/gitlab/middleware/static.rb:9:in `call' # ------------------ # --- Caused by: --- # NoMethodError: # undefined method `+' for nil:NilClass # ./app/models/project.rb:807:in `name_with_namespace' ``` Capybara's `click_link` method doesn't actually wait for the page to reload. When the `expand_all_diffs` parameter is used, we need to search for unique elements that appear to ensure that the page has actually reloaded. Closes #21841
* Merge branch 'fix-suggested-colors-underline' into 'master' Annabel Dunstone Gray2016-09-022-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove suggested colors hover underline ## What does this MR do? * Removes the blue hover underline for the suggested color containers * Added `cursor: pointer` to the suggested color containers ## Are there points in the code the reviewer needs to double check? Shouldn't be :smile: ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![DS48AvgSVX](/uploads/0077e7a5837c8ce9fe2493ad6a42a018/DS48AvgSVX.gif) After: ![olZzS68WNr](/uploads/4e0ae808c69942a528f1303df8cddeae/olZzS68WNr.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21792 See merge request !6165
| * Remove suggested colors hover underlineClement Ho2016-09-022-0/+2
| |
* | Merge branch 'icon-button-alignment' into 'master' Fatih Acet2016-09-024-5/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of icon buttons ## What does this MR do? Fix misalignment of buttons with only an icon which was introduced by !5451. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627 ## Screenshots ### Before ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png) ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png) ### After ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png) ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png) See merge request !5887
| * | Fix alignment of icon buttons (!5887)winniehell2016-08-194-5/+8
| | |
* | | Merge branch 'fix-wiki-anchor-interaction' into 'master' Fatih Acet2016-09-024-17/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown anchor icon interaction ## What does this MR do? Fixes and improves the markdown anchor icon interaction so that hovering over any headers (generated through markdown) will have an anchor icon that's easily accessible (won't hide from you on edge cases), replaced the icon with fontAwesome icon and added more padding for the anchor icon. ## Are there points in the code the reviewer needs to double check? 1. Need to check if it's okay to replace the icon-link.png with fontAwesome 2. Need to check if it's okay for the additional view padding on views that render markdown to compensate for anchor link space 3. Need to check if there are any other views that render markdown that did not have it's padding re-adjusted ## Why was this MR needed? Improve markdown rendered anchor links so that they are more user friendly ## What are the relevant issue numbers? Closes #20459 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-30_at_2.31.43_PM](/uploads/12b2aad7f130d26a709ff28083ecc2e3/Screen_Shot_2016-07-30_at_2.31.43_PM.png) After: ![Screen_Shot_2016-08-08_at_10.25.06_AM](/uploads/caac1985cfbd305b8c8665d86e30ab24/Screen_Shot_2016-08-08_at_10.25.06_AM.png) Before: ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif](https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif) After: ![nLQOMn9RUO](/uploads/3905ceac2d591399d14cec1b3319f46b/nLQOMn9RUO.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5577
| * | | Fix markdown anchor icon interactionClement Ho2016-09-024-17/+12
| | | |
* | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' Annabel Dunstone Gray2016-09-021-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `.term-bold` declaration. ## What does this MR do? Added `.term-bold` declaration. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/21471#note_14874299 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21471 See merge request !6171
| * | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styledLuke "Jared" Bennett2016-09-021-0/+3
| | | | |
* | | | | Merge branch 'fix-add-button-alignment' into 'master' Fatih Acet2016-09-022-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align add button on repository view ## What does this MR do? Top aligns the add button to the other UI elements adjacent to it :smile: ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21168 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_3.53.00_PM__2_](/uploads/5d6d765bb8a1d640170805ec32956790/Screen_Shot_2016-08-24_at_3.53.00_PM__2_.png) After: ![Screen_Shot_2016-08-24_at_3.52.44_PM__2_](/uploads/1db9f0f68ef5defa4dd111d7dae1dc26/Screen_Shot_2016-08-24_at_3.52.44_PM__2_.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5971
| * | | | | Align add button on repository viewClement Ho2016-09-012-0/+5
| | | | | |
* | | | | | Merge branch 'replace-coffeescript' into 'master' Fatih Acet2016-09-023-50/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert datetime coffeescript spec to ES6 ## What does this MR do? Converts the last remnant coffeescript file to ES6 ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Because we aren't using coffeescript anymore :balloon: ## What are the relevant issue numbers? #21472 ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6045
| * | | | | | Convert datetime coffeescript spec to ES6Clement Ho2016-09-013-50/+65
| |/ / / / /
* | | | | | Merge branch 'project-edit-features-hide' into 'master' Fatih Acet2016-09-024-18/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides merge request section in edit project when disabled ## What does this MR do? Correctly hides the merge request section in the project edit page when disabled. It used to work before the feature visibility part was changed to dropdown - so added a test to prevent in future! :thumbsup: ## Screenshots (if relevant) ![hide](/uploads/eb72ef87bad19c2716472a0c1031fd32/hide.gif) See merge request !6175
| * | | | | | Refactored code to rely less on IDs that could changeproject-edit-features-hidePhil Hughes2016-09-022-6/+14
| | | | | | |
| * | | | | | Hides merge request section in edit project when disabledPhil Hughes2016-09-023-15/+75
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'commit-message-scroll' into 'master' Fatih Acet2016-09-0211-83/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit message blocks #### What does this MR do? * Wraps code commit message blocks * Consolidates similar shades of gray (cc @cperessini @tauriedavis) Related to #20831 #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-19_at_10.41.07_AM](/uploads/4529d178123e18b0aad35a252061902b/Screen_Shot_2016-08-19_at_10.41.07_AM.png) After: ![Screen_Shot_2016-08-19_at_10.40.42_AM](/uploads/499818f360e7c3cd9d31bc335cae1a82/Screen_Shot_2016-08-19_at_10.40.42_AM.png) See merge request !5906
| * | | | | | Changelog fixescommit-message-scrollAnnabel Dunstone2016-08-281-5/+1
| | | | | | |
| * | | | | | Wrap commit message blocksAnnabel Dunstone2016-08-282-0/+7
| | | | | | |
| * | | | | | Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafaAnnabel Dunstone2016-08-2810-83/+82
| | | | | | |
* | | | | | | Merge branch 'member-expiration-date-on-update' into 'master' Douwe Maan2016-09-023-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix expiration date picker after update @DouweM this object is now on `gl`, not on the window. It would only break when trying to use the date picker on a newly-inserted member element, but I figure it's probably worth sneaking into a patch. See merge request !6184
| * | | | | | | Fix expiration date picker after updateSean McGivern2016-09-023-2/+3
| | | | | | | |
* | | | | | | | Merge branch '21122-move-list-of-builds-to-bottom-of-sidebar' into 'master' Annabel Dunstone Gray2016-09-022-38/+45
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved builds panel to the bottom of the builds sidemenu (and change retry link colour) ## What does this MR do? Moves the builds panel to the bottom of the builds sidemenu. Changes the `Retry` link to look more _linky_. :paperclips: ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? On small screens, the builds panel must be scrolled through before you can get to the details of the build you're looking at. ## What are the relevant issue numbers? Closes #21122 ## Screenshots (if relevant) ![Screen_Shot_2016-08-20_at_17.41.51](/uploads/84f10c43011da514ef8ac1b1d20eb5d5/Screen_Shot_2016-08-20_at_17.41.51.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #21122 See merge request !5923
| * | | | | | | Review changes21122-move-list-of-builds-to-bottom-of-sidebarLuke Bennett2016-08-231-1/+1
| | | | | | | |
| * | | | | | | Changed `retry` link to blueLuke Bennett2016-08-232-1/+8
| | | | | | | |
| * | | | | | | Moved builds panel to the bottom of the builds sidemenuLuke Bennett2016-08-232-36/+36
| | | | | | | |
* | | | | | | | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' Douwe Maan2016-09-026-32/+176
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle error on trace raw download with old builds (DB stored) ## What does this MR do? Handles error on `raw build trace` download action for old builds (which are stored in DB instead of file). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? At the beginning build traces were stored in database but at some point we moved to store them in files. All trace related actions are aware of this, but not `raw trace download`. ## What are the relevant issue numbers? Fixes #18900 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4822
| * | | | | | | | Refactor Ci::Build#raw_tracefix/handle-raw-trace-error-on-old-buildsTomasz Maczukin2016-09-011-5/+2
| | | | | | | | |
| * | | | | | | | Move CHANGELOG entry to a proper versionTomasz Maczukin2016-09-011-3/+1
| | | | | | | | |
| * | | | | | | | Fix rubocop offencesTomasz Maczukin2016-09-011-2/+2
| | | | | | | | |
| * | | | | | | | Update specs - add mocks to simulate old versionsTomasz Maczukin2016-09-016-119/+133
| | | | | | | | |
| * | | | | | | | Add specsTomasz Maczukin2016-09-011-0/+51
| | | | | | | | |
| * | | | | | | | Change 404 to 410 error when raw trace is unavailableTomasz Maczukin2016-09-013-1/+70
| | | | | | | | |
| * | | | | | | | Refactorize CI::Build modelTomasz Maczukin2016-09-011-2/+10
| | | | | | | | |
| * | | | | | | | Update CHANGELOGTomasz Maczukin2016-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Handle error on trace raw download with old builds (DB stored)Tomasz Maczukin2016-09-013-2/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-fix-gitlab-import' into 'master' Douwe Maan2016-09-022-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab import button cc @MrChrisW Closes gitlab-org/gitlab-ce#21795 See merge request !6167