diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-06 02:32:16 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-06 02:32:16 +0300 |
| commit | 4e3de96ed059db39ee16ce99e5a4b4e8de14ea55 (patch) | |
| tree | dd782bb03fe3408d2425c368932e28da45f508b0 /config | |
| parent | e3ce5b642e3cff6920f443a34a2e9b0099e07a88 (diff) | |
| parent | 8eb350663e0dbee481e5a5f2a785dbbf365e18cc (diff) | |
Merge branch 'gitaly-prevent-autoload' into 'master'
Deal with Rails autoload instance variable resets
See merge request !10338
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/8_gitaly.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb index c7f27c78535..42ec7240b0f 100644 --- a/config/initializers/8_gitaly.rb +++ b/config/initializers/8_gitaly.rb @@ -2,17 +2,5 @@ require 'uri' # Make sure we initialize our Gitaly channels before Sidekiq starts multi-threaded execution. if Gitlab.config.gitaly.enabled || Rails.env.test? - Gitlab.config.repositories.storages.each do |name, params| - address = params['gitaly_address'] - - unless address.present? - raise "storage #{name.inspect} is missing a gitaly_address" - end - - unless URI(address).scheme.in?(%w(tcp unix)) - raise "Unsupported Gitaly address: #{address.inspect}" - end - - Gitlab::GitalyClient.configure_channel(name, address) - end + Gitlab::GitalyClient.configure_channels end |