diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-06 22:08:06 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-06 22:08:06 +0000 |
| commit | 596567e8ea451561fcb2b1eb4bb2df3a6870c5cc (patch) | |
| tree | 7d6ad9a8a5455b47eec88577339a48645b98d185 /config | |
| parent | 599d94993699d04d07738bede17dbd93282c4edd (diff) | |
| parent | 9141341b9d6c00eaf4a9639dfbfa75514f65b3f1 (diff) | |
| download | gitlab-ce-596567e8ea451561fcb2b1eb4bb2df3a6870c5cc.tar.gz | |
Merge branch 'sh-fix-issue-54718' into 'master'
Disable Sidekiq feature flag check if features table does not exist
Closes #54718
See merge request gitlab-org/gitlab-ce!23639
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
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 |