From b5057c47176fe3170eec148462f97a1e3964b93a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Mar 2021 05:39:58 +0100
Subject: [PATCH] Bump sidekiq-unique-jobs from 6.0.25 to 7.0.1 (#15627)
* Bump sidekiq-unique-jobs from 6.0.25 to 7.0.1
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.25 to 7.0.1.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.25...v7.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
* Fix migration being broken by sidekiq-unique-jobs update
* Fix migration script following API changes in dependency
* Fixup
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ThibG <thib@sitedethib.com>
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++++---
db/migrate/20200508212852_reset_unique_jobs_locks.rb | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index e3a8267d46..a4a2cc91c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,7 +85,7 @@ gem 'sanitize', '~> 5.2'
gem 'scenic', '~> 1.5'
gem 'sidekiq', '~> 6.1'
gem 'sidekiq-scheduler', '~> 3.0'
-gem 'sidekiq-unique-jobs', '~> 6.0'
+gem 'sidekiq-unique-jobs', '~> 7.0'
gem 'sidekiq-bulk', '~>0.2.0'
gem 'simple-navigation', '~> 4.1'
gem 'simple_form', '~> 5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index b4607f1d4e..b59cfb1f31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,6 +108,9 @@ GEM
msgpack (~> 1.0)
brakeman (4.10.1)
browser (4.2.0)
+ brpoplpush-redis_script (0.1.1)
+ concurrent-ruby (~> 1.0, >= 1.0.5)
+ redis (>= 1.0, <= 5.0)
builder (3.2.4)
bullet (6.1.4)
activesupport (>= 3.0.0)
@@ -586,9 +589,10 @@ GEM
sidekiq (>= 3)
thwait
tilt (>= 1.4.0)
- sidekiq-unique-jobs (6.0.25)
+ sidekiq-unique-jobs (7.0.1)
+ brpoplpush-redis_script (> 0.0.0, <= 2.0.0)
concurrent-ruby (~> 1.0, >= 1.0.5)
- sidekiq (>= 4.0, < 7.0)
+ sidekiq (>= 5.0, < 7.0)
thor (>= 0.20, < 2.0)
simple-navigation (4.1.0)
activesupport (>= 2.3.2)
@@ -799,7 +803,7 @@ DEPENDENCIES
sidekiq (~> 6.1)
sidekiq-bulk (~> 0.2.0)
sidekiq-scheduler (~> 3.0)
- sidekiq-unique-jobs (~> 6.0)
+ sidekiq-unique-jobs (~> 7.0)
simple-navigation (~> 4.1)
simple_form (~> 5.1)
simplecov (~> 0.21)
diff --git a/db/migrate/20200508212852_reset_unique_jobs_locks.rb b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
index 3ffdeb0aa8..304e493223 100644
--- a/db/migrate/20200508212852_reset_unique_jobs_locks.rb
+++ b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
@@ -5,7 +5,7 @@ class ResetUniqueJobsLocks < ActiveRecord::Migration[5.2]
# We do this to clean up unique job digests that were not properly
# disposed of prior to https://github.com/tootsuite/mastodon/pull/13361
- SidekiqUniqueJobs::Digests.delete_by_pattern('*', count: SidekiqUniqueJobs::Digests.count)
+ until SidekiqUniqueJobs::Digests.new.delete_by_pattern('*').nil?; end
end
def down; end
--
GitLab