Merge tag 'v3.0.0' into glitch-soc/merge-upstream

2019-10-04 19:49:43 +02:00
parent 360234d1bf 83d3e7733d
commit 1bbba0016a
31 changed files with 419 additions and 81 deletions
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -22,7 +22,7 @@ class MoveWorker
    @source_account.passive_relationships
                   .where(account: Account.local)
                   .in_batches
-                   .update_all(target_account: @target_account)
+                   .update_all(target_account_id: @target_account.id)
  end

  def queue_follow_unfollows!