diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-28 19:34:11 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-28 19:34:11 +0000 |
commit | 47fbba447423f274211173ddb60ade4d14961cb3 (patch) | |
tree | a6d37b24fa94abb42285d58c00426927bc1c0f7f | |
parent | 17ef4cdff96991727fd2d205d1871b99272a55b9 (diff) | |
parent | 0eab0c6efd6779e4e7c78fae4959b8897c055ecf (diff) | |
download | gitlab-ce-47fbba447423f274211173ddb60ade4d14961cb3.tar.gz |
Merge branch 'fix-gitlab-yml-syntax' into 'master'
Fixed syntax in gitlab.yml.example
See merge request !2230
-rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7725fa34031..a26002ec07d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -4,7 +4,7 @@ # ########################### NOTE ##################################### # This file should not receive new settings. All configuration options # -* are being moved to ApplicationSetting model! # +# * are being moved to ApplicationSetting model! # # If a setting requires an application restart say so in that screen. # # If you change this file in a Merge Request, please also create # # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # |