diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-28 15:36:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-28 15:36:44 +0000 |
| commit | 17ef4cdff96991727fd2d205d1871b99272a55b9 (patch) | |
| tree | feb20258fa7632b787300da21942592bf2803db0 | |
| parent | 29fe466a4d309f73b09cd18e837ddcd59fbd1359 (diff) | |
| parent | 297f83425e8917d6fbebdc00a612aa08ec855b5e (diff) | |
| download | gitlab-ce-17ef4cdff96991727fd2d205d1871b99272a55b9.tar.gz | |
Merge branch 'restart-settings-are-moved-too' into 'master'
Restart settings are moved too.
See merge request !2226
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index da6d4005da6..7725fa34031 100644 --- 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 # -# 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 # ######################################################################## |