diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-18 08:15:26 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-18 08:15:26 +0000 |
| commit | aca47a5be6ed1c0f58c1d0471b4439bdef5b9bbd (patch) | |
| tree | 2679a4655a3fd05a717bac521fefe9de93c8ce74 | |
| parent | 937c1b5be91be4b500fa7cc1faf5d1aabbd16d41 (diff) | |
| parent | c84a470bab08abce2ac9ad268e57c1c90fb7755e (diff) | |
| download | gitlab-ce-aca47a5be6ed1c0f58c1d0471b4439bdef5b9bbd.tar.gz | |
Merge branch 'rails5-queue-name' into 'master'
Fix queue_name in Rails 5
Closes #47372
See merge request gitlab-org/gitlab-ce!19874
| -rw-r--r-- | spec/workers/every_sidekiq_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index 9e3b99b3502..2106959e23c 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -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 |