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

Merge branch 'patch-3' into 'master'
c9240d91 · Achilleas Pipinellis · a77394a7 · f9cffe10 · c9240d91 · c9240d91
Commit c9240d91 authored Aug 08, 2016 by Achilleas Pipinellis
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

_form.html.haml app/views/admin/application_settings/_form.html.haml +3 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.11.0 (unreleased)
  - Optimize checking if a user has read access to a list of issues !5370
  - Nokogiri's various parsing methods are now instrumented
  - Add simple identifier to public SSH keys (muteor)
+  - Admin page now references docs instead of a specific file !5600 (AnAverageHuman)
  - Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
  - Fix filter input alignment (ClemMakesApps)
  - Include old revision in merge request update hooks (Ben Boeckel)

--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -366,7 +366,9 @@
      .col-sm-10
        = f.select :repository_storage, repository_storage_options_for_select, {}, class: 'form-control'
        .help-block
-          You can manage the repository storage paths in your gitlab.yml configuration file
+          Manage repository storage paths. Learn more in the
+          = succeed "." do
+            = link_to "repository storages documentation", help_page_path("administration/repository_storages")

  %fieldset
    %legend Repository Checks