Commit 596567e8 authored by Robert Speicher's avatar Robert Speicher

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
parents 599d9499 9141341b
...@@ -39,7 +39,7 @@ Sidekiq.configure_server do |config| ...@@ -39,7 +39,7 @@ Sidekiq.configure_server do |config|
ActiveRecord::Base.clear_all_connections! ActiveRecord::Base.clear_all_connections!
end 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) Sidekiq::ReliableFetcher.setup_reliable_fetch!(config)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment