summaryrefslogtreecommitdiff
path: root/config/initializers/8_gitaly.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/8_gitaly.rb')
-rw-r--r--config/initializers/8_gitaly.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb
index 07dd30f0a24..42ec7240b0f 100644
--- a/config/initializers/8_gitaly.rb
+++ b/config/initializers/8_gitaly.rb
@@ -1,2 +1,6 @@
-# Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
-Gitlab::GitalyClient.channel unless Rails.env.test?
+require 'uri'
+
+# Make sure we initialize our Gitaly channels before Sidekiq starts multi-threaded execution.
+if Gitlab.config.gitaly.enabled || Rails.env.test?
+ Gitlab::GitalyClient.configure_channels
+end