diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-12 11:39:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 11:39:55 +0200 |
| commit | db2f6fa49b1a704c66be3f0ea04a440cde80cf50 (patch) | |
| tree | 705571dd7a856c57f23dfd02917c115a887ca525 /app/lib | |
| parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
| parent | 671a95c545bf7b47d74e1021b76d17bbf44cc5cc (diff) | |
Merge pull request #1535 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 763c417f9..cc2d391fb 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -46,7 +46,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity return reject_payload! if unsupported_object_type? || invalid_origin?(object_uri) || tombstone_exists? || !related_to_local_activity? lock_or_fail("create:#{object_uri}") do - return if delete_arrived_first?(object_uri) || poll_vote? # rubocop:disable Lint/NonLocalExitFromIterator + return if delete_arrived_first?(object_uri) || poll_vote? @status = find_existing_status |