summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-06 11:23:54 -0800
committerStan Hu <stanhu@gmail.com>2018-12-06 11:34:35 -0800
commit9141341b9d6c00eaf4a9639dfbfa75514f65b3f1 (patch)
tree8efb025390f1c25e7b40fb18ccb9625b98a69b33 /config
parenta50c777d958d6e0f5c4cfc02294a40da088ceabd (diff)
downloadgitlab-ce-9141341b9d6c00eaf4a9639dfbfa75514f65b3f1.tar.gz
Disable Sidekiq feature flag check if features table does not exist
The GitLab Development Kit initialization failed because the Sidekiq initializer was attempting to look up a feature flag when the `features` table hadn't been created yet. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54718
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 4210be2c701..f20ea488d9c 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -39,7 +39,7 @@ Sidekiq.configure_server do |config|
ActiveRecord::Base.clear_all_connections!
end
- if Feature.enabled?(:gitlab_sidekiq_reliable_fetcher)
+ if Feature::FlipperFeature.table_exists? && Feature.enabled?(:gitlab_sidekiq_reliable_fetcher)
Sidekiq::ReliableFetcher.setup_reliable_fetch!(config)
end