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/lib/activitypub/activity/move.rb
+++ b/app/lib/activitypub/activity/move.rb
@ -20,6 +20,9 @@ class ActivityPub::Activity::Move < ActivityPub::Activity

    # Initiate a re-follow for each follower
    MoveWorker.perform_async(origin_account.id, target_account.id)
+  rescue
+    unmark_as_processing!
+    raise
  end

  private