diff options
author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/lib/activitypub/activity | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity')
-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 d3d460551..e81452e3c 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -45,7 +45,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity RedisLock.acquire(lock_options) do |lock| if lock.acquired? - return if delete_arrived_first?(object_uri) || poll_vote? + return if delete_arrived_first?(object_uri) || poll_vote? # rubocop:disable Lint/NonLocalExitFromIterator @status = find_existing_status |