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

db/migrate/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: ../../.rubocop.yml
+
+Naming/VariableNumber:
+  CheckSymbols: false

db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb

@@ -19,7 +19,6 @@ class AddSilencedAtSuspendedAtToAccounts < 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