Commit aca47a5b authored by Sean McGivern's avatar Sean McGivern

Merge branch 'rails5-queue-name' into 'master'

Fix queue_name in Rails 5

Closes #47372

See merge request gitlab-org/gitlab-ce!19874
parents 937c1b5b c84a470b
......@@ -13,7 +13,7 @@ describe 'Every Sidekiq worker' do
file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set
worker_queues = Gitlab::SidekiqConfig.workers.map(&:queue).to_set
worker_queues << ActionMailer::DeliveryJob.queue_name
worker_queues << ActionMailer::DeliveryJob.new.queue_name
worker_queues << 'default'
missing_from_file = worker_queues - file_worker_queues
......
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