diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-06-11 15:11:37 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-06-11 15:11:37 +0200 |
| commit | df346e9507a057ccb72d4edad53674ac014333a0 (patch) | |
| tree | 94fcf01971e599c32b04dcfa254a96c4d3d270d3 /config/gitlab.yml.example | |
| parent | 3de35168fd556a9ba980c9ffdb6705990a53a37a (diff) | |
| download | gitlab-ce-df346e9507a057ccb72d4edad53674ac014333a0.tar.gz | |
Add a note that changing example configuration files requires changing omnibus-gitlab.note_about_omnibus_changes
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f48c99fd901..96b6ed01f42 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -4,9 +4,13 @@ # ########################### NOTE ##################################### # This file should not receive new settings. All configuration options # -# are being moved to ApplicationSetting model! # +# that do not require application restart are being moved to # +# ApplicationSetting model! # +# If you change this file in a Merge Request, please also create # +# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # ######################################################################## # +# # How to use: # 1. Copy file as gitlab.yml # 2. Update gitlab -> host with your fully qualified domain name @@ -149,7 +153,7 @@ production: &base allow_username_or_email_login: false # To maintain tight control over the number of active users on your GitLab installation, - # enable this setting to keep new users blocked until they have been cleared by the admin + # enable this setting to keep new users blocked until they have been cleared by the admin # (default: false). block_auto_created_users: false |