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/ostatus/activity | |
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/ostatus/activity')
-rw-r--r-- | app/lib/ostatus/activity/creation.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index dbccc8330..d3a303a0c 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/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 |