diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-30 16:05:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-30 16:05:47 +0000 |
| commit | 8f1460ac776dedf2a0e42decc1d0d1f3f9a76576 (patch) | |
| tree | 142047de3442096204e8b0de84cbea7861505cbc /config | |
| parent | 94ed06562a3ddbe6b46744ac776f232451c798dd (diff) | |
| parent | 28590e8854fd15f1a36befb66c68efbb490f9f04 (diff) | |
| download | gitlab-ce-8f1460ac776dedf2a0e42decc1d0d1f3f9a76576.tar.gz | |
Merge branch 'gitaly-opt-out' into 'master'
Enable Gitaly by default in GitLab 9.3
Closes gitaly#242
See merge request !11796
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a727f7e2fa3..6c1c1f8c041 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -449,7 +449,7 @@ production: &base # This setting controls whether GitLab uses Gitaly (new component # introduced in 9.0). Eventually Gitaly use will become mandatory and # this option will disappear. - enabled: false + enabled: true # # 4. Advanced settings diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4fb4baf631f..45ea2040d23 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -482,7 +482,7 @@ Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour # Gitaly # Settings['gitaly'] ||= Settingslogic.new({}) -Settings.gitaly['enabled'] ||= false +Settings.gitaly['enabled'] = true if Settings.gitaly['enabled'].nil? # # Webpack settings |