summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 15:09:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 15:09:10 +0000
commit8e129497b2565b8c595ef4f806d9a9595ca654e5 (patch)
tree7afeeca3ea58013c1e8c3a2055661bacf65577da /config
parent8ae26d705abe341b03bc15d4373d6cd0c77c0baf (diff)
downloadgitlab-ce-8e129497b2565b8c595ef4f806d9a9595ca654e5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq_cluster.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq_cluster.rb b/config/initializers/sidekiq_cluster.rb
index baa7495aa29..4622984fe0c 100644
--- a/config/initializers/sidekiq_cluster.rb
+++ b/config/initializers/sidekiq_cluster.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-if ENV['ENABLE_SIDEKIQ_CLUSTER'] && Gitlab.ee?
+if ENV['ENABLE_SIDEKIQ_CLUSTER']
Thread.new do
Thread.current.abort_on_exception = true