diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 12:30:31 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 12:30:31 +0000 |
| commit | 5c0d8d59ff676373659e4215067f3640604576e0 (patch) | |
| tree | 5fbb3df5e7f63eb23651f7898d75c0e6378590d4 /config | |
| parent | d40445e4c9964ae0ab793bfdd7ba530de4259716 (diff) | |
| parent | 78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4 (diff) | |
| download | gitlab-ce-5c0d8d59ff676373659e4215067f3640604576e0.tar.gz | |
Merge branch 'gitaly-mandatory' into 'master'
Remove option to disable Gitaly in Rails
See merge request !12677
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/initializers/8_gitaly.rb | 8 |
3 files changed, 3 insertions, 10 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 1eb209ac2be..75d03de18a1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -450,10 +450,6 @@ production: &base # Gitaly settings gitaly: - # 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: true # Default Gitaly authentication token. Can be overriden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index cb11d2c34f4..fa33e602e93 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -483,7 +483,6 @@ Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour # Gitaly # Settings['gitaly'] ||= Settingslogic.new({}) -Settings.gitaly['enabled'] = true if Settings.gitaly['enabled'].nil? # # Webpack settings diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb index 31c7c91d78f..f4f116e67f7 100644 --- a/config/initializers/8_gitaly.rb +++ b/config/initializers/8_gitaly.rb @@ -1,8 +1,6 @@ require 'uri' -if Gitlab.config.gitaly.enabled || Rails.env.test? - Gitlab.config.repositories.storages.keys.each do |storage| - # Force validation of each address - Gitlab::GitalyClient.address(storage) - end +Gitlab.config.repositories.storages.keys.each do |storage| + # Force validation of each address + Gitlab::GitalyClient.address(storage) end |