summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pass variables from deployment project services to CI runnerexpose-deployment-variablesAdam Niedzielski2016-12-1610-1/+116
| | | | | | | | | | This commit introduces the concept of deployment variables - variables that are collected from deployment services and passed to CI runner during a deployment build. Deployment services specify the variables by overriding "predefined_variables" method. This commit also configures variables for KubernetesService
* Merge branch 'ux-guide-cursors' into 'master' Achilleas Pipinellis2016-12-167-0/+16
|\ | | | | | | | | | | | | UX Guide: add guidance on cursor usage Add guidance to the UX guide on when to use what mouse cursor. See merge request !8128
| * [ci skip] UX Guide: add guidance on cursor usageux-guide-cursorsAllison Whilden2016-12-157-0/+16
| |
* | Merge branch 'dz-nested-groups-title-ui' into 'master' Sean McGivern2016-12-168-8/+50
|\ \ | | | | | | | | | | | | UI improvements for nested group feature See merge request !8062
| * | Refactor Namespace#parents methoddz-nested-groups-title-uiDmitriy Zaporozhets2016-12-152-12/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add tests for Namespace#full_name methodDmitriy Zaporozhets2016-12-131-0/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use full_name for Group in UIDmitriy Zaporozhets2016-12-131-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add parents method to NamespaceDmitriy Zaporozhets2016-12-132-5/+28
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use full group name for admin group index and show pagesDmitriy Zaporozhets2016-12-132-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Show full path for nested groups at dashboard groups listDmitriy Zaporozhets2016-12-132-1/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Show full path in header UI for nested groups/projectsDmitriy Zaporozhets2016-12-132-4/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-master-eslint-errors' into 'master' Douglas Barbosa Alexandre2016-12-164-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint errors Fixes current eslint errors on master See merge request !8127
| * | | Fix eslint errorsfix-master-eslint-errorsAlfredo Sumaran2016-12-154-10/+10
| | |/ | |/|
* | | Merge branch 'fix/build' into 'master' Douglas Barbosa Alexandre2016-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix spec/features/admin/admin_active_tab_spec.rb See merge request !8130
| * | | Fix spec/features/admin/admin_active_tab_spec.rbfix/buildDouglas Barbosa Alexandre2016-12-151-1/+1
| | | |
* | | | Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Don't open Asciidoc module twice See merge request !8119
| * | | Don't open Asciidoc module twiceMunken2016-12-151-4/+0
| | | |
* | | | Merge branch 'docs/add-okta-auth' into 'master' Achilleas Pipinellis2016-12-154-1/+162
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add Okta authentication documentation Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/14122 See merge request !8104
| * | | Add Okta authentication documentationdocs/add-okta-authAchilleas Pipinellis2016-12-154-1/+162
| | | |
* | | | Merge branch 'ha_docs_auto_migrate_false' into 'master' Achilleas Pipinellis2016-12-152-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip] ## What does this MR do? In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file. See merge request !8112
| * | | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]Drew Blessing2016-12-152-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file.
* | | | | Merge branch ↵Kamil Trzciński2016-12-153-12/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' into 'master' Resolve "gitlab-ce mattermost slash command for issue create needs better documentation" ## What does this MR do? Updates the documentation and the <kbd>help</kbd> command to be clearer, having the keys used to add a newline in chat clients (both Mattermost and Slack). ## Are there points in the code the reviewer needs to double check? * Are the available commands (via <kbd>help</kbd>) being formatted as `<code>` ? ## Why was this MR needed? `\n` represents a new line character and doesn't communicate how the user should input the command. Also, to be correct, the documentation should use `<kbd>` instead of `<code>` for user input ([see HTML5 specification](https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element)) ## Screenshots (if relevant) | Mattermost | Docs | | --- | --- | | ![image](/uploads/539526a14bfd551b7e732dd96c5b7581/image.png) | ![image](/uploads/e3eb099f86c5a32ce3b8954e72c29848/image.png) | ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing ## What are the relevant issue numbers? Closes #25144 See merge request !7850
| * | | | | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-152-2/+2
| | | | | |
| * | | | | Merge branch ↵Pedro Moreira da Silva2016-12-150-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' of gitlab.com:gitlab-org/gitlab-ce into 25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation
| | * | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
| | * | | | | Update Mattermost slash commands docs to explain how to create a newline and ↵Pedro Moreira da Silva2016-11-301-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
| | * | | | | Improve `issue create …` slash command with user input keys to create a ↵Pedro Moreira da Silva2016-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | newline in chat clients.
| * | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
| * | | | | | Update Mattermost slash commands docs to explain how to create a newline and ↵Pedro Moreira da Silva2016-12-151-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
| * | | | | | Improve `issue create …` slash command with user input keys to create a ↵Pedro Moreira da Silva2016-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | newline in chat clients.
* | | | | | | Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into ↵Fatih Acet2016-12-158-127/+199
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve bulk assignment This MR improves current implementation of Label dropdown when used for bulk assignment on issuable pages (/:namespace/:project/issues, /:namespace/:project/merge_requests) Previously this dropdown relied on `<input>` tags to get its active items and also to calculate items with indeterminate state. Relying on `<input>` tags is not enough when we want to set/get multiple states on a dropdown. For this case we want to get/set: - Marked items - Unmarked items that were initially marked - Unmarked items that were initially indeterminate - Items with indeterminate state. This MR makes the Label dropdown to save its own state as `data` so it will be easy to get and set whatever state we want no matter if the dropdown is filtering which is the issue that I initially wanted to solve as you can see in the following gif. **Before** ![2016-12-07_11.44.48](/uploads/cb697161b8b39cdee72fdbb95a531100/2016-12-07_11.44.48.gif) **After** ![2016-12-07_11.32.43](/uploads/338255a302de0dd1367474f33232d2a3/2016-12-07_11.32.43.gif) As you can see in the first gif the `bug` label is removed from the selected issues but the `enhancement` label should set but the `critical` should be kept. This is fixed on the next gif. Fixes #24877 See merge request !7765
| * | | | | | | Address feedback24877-bulk-edit-only-keeps-common-labels-when-searchingAlfredo Sumaran2016-12-144-17/+23
| | | | | | | |
| * | | | | | | Remove unwanted semicolonAlfredo Sumaran2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeate after me: This is not JS
| * | | | | | | Add changelog fileAlfredo Sumaran2016-12-142-1/+5
| | | | | | | |
| * | | | | | | Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-147-123/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when the user wants to add a label. The user has to use the dropdown’s filter input to look for a label and click it in order to see the bug. Step to reproduce - Select at least two issues, one label should be present in all issues, other label should be present in at least one. - On the label dropdown: Deselect label that is present in all issues, look for another issue using the filter input and click it. - Click on `Update issues` Before: Unmarked label were kept on selected issues. Now: Unmarked label is removed from selected issues
* | | | | | | | Merge branch '25617-todos-filter-placeholder' into 'master' Annabel Dunstone Gray2016-12-152-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25617 Fix placeholder color of todo filters ## What does this MR do? Fixes color of placeholder text on todo filters ## Screenshots (if relevant) ![Screen_Shot_2016-12-14_at_1.42.02_PM](/uploads/7ceec3c8fff47825384835bcfb38d77c/Screen_Shot_2016-12-14_at_1.42.02_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #25617 See merge request !8094
| * | | | | | | | 25617 Fix placeholder color of todo filters25617-todos-filter-placeholdertauriedavis2016-12-142-3/+7
| | | | | | | | |
* | | | | | | | | Merge branch '24824-dropdown-items-focus' into 'master' Annabel Dunstone Gray2016-12-152-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24824 Add focus state to dropdowns ## What does this MR do? Adds focus state to dropdown items to increase accessibility. ## Screenshots (if relevant) ![Screen_Shot_2016-12-01_at_2.47.13_PM](/uploads/d0d2c17dde61314c86155268815091f6/Screen_Shot_2016-12-01_at_2.47.13_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #24824 See merge request !7885
| * | | | | | | | | 24824 Add focus state to dropdowns24824-dropdown-items-focustauriedavis2016-12-142-1/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'show-commit-status-from-latest-pipeline' into 'master' Grzegorz Bizon2016-12-158-33/+105
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show commit status from latest pipeline Show commit status from latest pipeline rather than compound status from all pipelines. Closes #20560 See merge request !7333
| * | | | | | | | | | Add explicit status test, feedback:show-commit-status-from-latest-pipelineLin Jen-Shin2016-12-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20058993 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059060 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059357
| * | | | | | | | | | Don't call anything on a block, use simple ifLin Jen-Shin2016-12-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20058743
| * | | | | | | | | | Use described_class and update descriptionLin Jen-Shin2016-12-152-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059124 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059187 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059322
| * | | | | | | | | | Also use latest_status, feedback:Lin Jen-Shin2016-12-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20058857
| * | | | | | | | | | Introduce latest_status and add a few testsLin Jen-Shin2016-12-145-5/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20003268
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-1458-170/+1125
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-commit-status-from-latest-pipeline * upstream/master: (39 commits) Improve build status specs contexts descriptions Add some missing tests for detailed status methods Remove trailing blank line from Allowable module Update manual build icon SVG Make it possible to mix `Gitlab::Routing` in Extract abilities checking module from ability model Extend tests for pipeline detailed status helpers Add tests for common build detailed status helpers Add missing tests for build `cancelable?` method Add tests for detailed build statuses factory Make it possible to retry build that was canceled Make build retryable only if complete and executed Improve readability in methods for detailed status Add tests for build cancelable/retryable statuses Extend specs for build play/stop detailed statuses Refine build stop/play extended status specs Use manual build icon in play/stop build statuses Adds manual action icon and case to show it Fix detailed status specs for pipeline stage model Fix detailed status badge for generic commit status ...
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-141149-9696/+20121
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-commit-status-from-latest-pipeline * upstream/master: (557 commits) Fix wrong error message expectation in API::Commits spec Move admin settings spinach feature to rspec Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show content Make rubocop happy API: Ability to cherry-pick a commit Be smarter when finding a sudoed user in API::Helpers Backport hooks on group policies for the EE-specific implementation API: Ability to get group's project in simple representation Add AddLowerPathIndexToRoutes to setup_postgresql.rake For single line git commit messages, the close quote should be on the same line as the open quote added border-radius and padding to labels Allow all alphanumeric characters in file names (!8002) Add failing test for #20190 Don't allow blank MR titles in API Replace static fixture for awards_handler_spec (!7661) Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day) Fix test Tweak style and add back wording Clean up commit copy to clipboard and make consistent ...
| * | | | | | | | | | | | Use Ci::Pipeline#latest for finding pipelinesLin Jen-Shin2016-11-242-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_18861407
| * | | | | | | | | | | | Rename latest_for to latest, feedback:Lin Jen-Shin2016-11-243-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#note_18819292
| * | | | | | | | | | | | Avoid using random in the tests, feedback:Lin Jen-Shin2016-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_18860042