diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 17:57:15 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 17:57:15 +0200 |
| commit | fc500a606225b56c3da7eaebf2bfb94e9cc97d2f (patch) | |
| tree | 224cbc337acea85bd7a358fb4985f0362432cf38 /db | |
| parent | 82bc8e764798b74f475763136117592526d905fa (diff) | |
| parent | 31593d14269bd5f21151d70eec1031aa30ee0937 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20200508212852_reset_unique_jobs_locks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20200508212852_reset_unique_jobs_locks.rb b/db/migrate/20200508212852_reset_unique_jobs_locks.rb index 304e49322..d717ffc54 100644 --- a/db/migrate/20200508212852_reset_unique_jobs_locks.rb +++ b/db/migrate/20200508212852_reset_unique_jobs_locks.rb @@ -3,7 +3,7 @@ class ResetUniqueJobsLocks < ActiveRecord::Migration[5.2] def up # We do this to clean up unique job digests that were not properly - # disposed of prior to https://github.com/tootsuite/mastodon/pull/13361 + # disposed of prior to https://github.com/mastodon/mastodon/pull/13361 until SidekiqUniqueJobs::Digests.new.delete_by_pattern('*').nil?; end end |