Skip to content
Snippets Groups Projects
Commit 2770caa6 authored by Sean McGivern's avatar Sean McGivern :red_circle:
Browse files

Merge branch 'upgrade-sidekiq-6-4-2' into 'master'

Upgrade Sidekiq to 6.4.2

See merge request !97208
parents 659a00bd 180943dd
No related branches found
No related tags found
2 merge requests!97251Synchronize ruby3 branch manually due to conflicts,!97208Upgrade Sidekiq to 6.4.2
Pipeline #633217384 passed
......@@ -1281,7 +1281,7 @@ GEM
shellany (0.0.1)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
sidekiq (6.4.0)
sidekiq (6.4.2)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
......
......@@ -9,5 +9,5 @@
require 'sidekiq/web'
if Rails.env.development?
Sidekiq.default_worker_options[:backtrace] = true
Sidekiq.default_job_options[:backtrace] = true
end
......@@ -289,7 +289,6 @@ def self.name
perform_action
expect(worker.jobs.count).to eq args.count
expect(worker.jobs).to all(include('enqueued_at'))
end
end
......@@ -302,7 +301,6 @@ def self.name
perform_action
expect(worker.jobs.count).to eq args.count
expect(worker.jobs).to all(include('enqueued_at'))
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment