Merge branch 'main' into glitch-soc/merge-upstream

2021-03-15 11:26:59 +01:00
parent 995ad2af30 e89e976e92
commit eac4a3e9c8
26 changed files with 83 additions and 88 deletions
--- 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