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

Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn

app/lib/activitypub/activity/create.rb

@@ -11,6 +11,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       if lock.acquired?
         @status = find_existing_status
         process_status if @status.nil?
+      else
+        raise Mastodon::RaceConditionError
       end
     end
 

app/lib/ostatus/activity/creation.rb

@@ -15,6 +15,8 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
         @status = find_status(id)
         return [@status, false] unless @status.nil?
         @status = process_status
+      else
+        raise Mastodon::RaceConditionError
       end
     end