diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-08 18:50:33 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-08 18:50:33 +0000 |
commit | c9240d91b04fa5c7376dc2bc257da41f32468cdc (patch) | |
tree | 4ab5d041af720a33a6529d9d2aaf344e9088d6bc /app/views | |
parent | a77394a7e526b462057c0ef88e5b8b06b96e2290 (diff) | |
parent | f9cffe104489416d9a640557d87b94fd39ea4e7e (diff) | |
download | gitlab-ce-c9240d91b04fa5c7376dc2bc257da41f32468cdc.tar.gz |
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
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 23f864df147..c7fd344eea2 100644 --- 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 |