Merge branch 'patch-3' into 'master'
"This file is managed by gitlab-ctl. Manual changes will be erased!" ## What does this MR do? This merge request replaces the word "gitlab.yml" with the word "gitlab.rb" in one section of the admin area. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Configuration is no longer done in gitlab.yml, which is overwritten by gitlab-ctl. ## What are the relevant issue numbers? None. ## Screenshots (if relevant) ## 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 - [ ] 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) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5600
Showing
Please register or sign in to comment