Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2023-10-19 19:14:04 +02:00
42 changed files with 476 additions and 169 deletions

View File

@@ -18,7 +18,6 @@ class RemoveSuspendedSilencedAccountFields < ActiveRecord::Migration[5.2]
# Record suspend date of blocks and silences for users whose limitations match
# a domain block
DomainBlock.where(severity: [:silence, :suspend]).find_each do |block|
scope = block.accounts
if block.suspend?
block.accounts.where(suspended: true).in_batches.update_all(suspended_at: block.created_at)
else