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

2020-11-09 10:53:53 +01:00
parent 0437d70628 2b63c62c57
commit ecd83f495c
239 changed files with 9901 additions and 4228 deletions
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -38,7 +38,7 @@ class SuspendAccountService < BaseService
      [Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), follow.target_account_id, @account.inbox_url]
    end

-    follows.in_batches.destroy_all
+    follows.each(&:destroy)
  end

  def distribute_update_actor!