diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-16 23:10:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 23:10:12 +0200 |
| commit | 4bf43e6f3e93643d989a2872763b41505fab2206 (patch) | |
| tree | e1b781fe4fae9d02284e5e836338cc598431413f /app/lib/activitypub/activity/create.rb | |
| parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
| parent | 78ac246b877072bb5f94da34d29612fafde3a8ae (diff) | |
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge changes from upstream
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 8d17a4ebe..ab1d63cd4 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/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 |