diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-06 15:45:29 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-07 13:48:34 +0300 |
commit | 78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4 (patch) | |
tree | f0f57d7fea851bf85b4c14449161ef38ffd8a00c /config/initializers | |
parent | f63ca524c9d80107d2328e3d8175d04aad9b4b8a (diff) |
Remove option to disable Gitaly completely
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
-rw-r--r-- | config/initializers/8_gitaly.rb | 8 |
2 files changed, 3 insertions, 6 deletions
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 |