diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
| commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
| tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /app/workers | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index 05139f616..cef595319 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -3,7 +3,7 @@ class ActivityPub::ProcessingWorker include Sidekiq::Worker - sidekiq_options backtrace: true + sidekiq_options backtrace: true, retry: 8 def perform(account_id, body, delivered_to_account_id = nil) ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true) |