diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
| commit | b2915613fb247597d3de2f80c2c007b3369ac5bb (patch) | |
| tree | 745c245cb4c2d16dcada37d1fb1cf5b13f4e2493 /app/models/admin | |
| parent | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (diff) | |
| parent | e38fc319dc6897ca867a509b0c7a5878d34d0f00 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
Diffstat (limited to 'app/models/admin')
| -rw-r--r-- | app/models/admin/status_batch_action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb index 319deff98..85822214b 100644 --- a/app/models/admin/status_batch_action.rb +++ b/app/models/admin/status_batch_action.rb @@ -56,7 +56,7 @@ class Admin::StatusBatchAction end UserMailer.warning(target_account.user, @warning).deliver_later! if target_account.local? - RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, preserve: target_account.local?, immediate: !target_account.local?] } + RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] } end def handle_report! |