Merge branch 'restart-settings-are-moved-too' into 'master'

Restart settings are moved too. See merge request !2226

Merge branch 'restart-settings-are-moved-too' into 'master'
Restart settings are moved too. See merge request !2226
17ef4cdf · Dmitriy Zaporozhets · 29fe466a · 297f8342 · 17ef4cdf
Commit 17ef4cdf authored Dec 28, 2015 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config/gitlab.yml.example config/gitlab.yml.example +2 -2

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -4,8 +4,8 @@
 #
 ###########################  NOTE  #####################################
 # This file should not receive new settings. All configuration options #
-# that do not require an application restart are being moved to        #
+* are being moved to ApplicationSetting model!                         #
-# 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  #
 ########################################################################