diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
| commit | c0dc247bcee9080989d5e5354e54f9d320be1f13 (patch) | |
| tree | 708074cbed581c48d619008f8ed58d962e0f15b7 /app/workers/activitypub | |
| parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
| parent | 89d600bedb023a9656b98d22deab10f8c051a664 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/delivery_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index f9c385ea3..5e4c391f0 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -51,7 +51,7 @@ class ActivityPub::DeliveryWorker end def response_error_unsalvageable?(response) - (400...500).cover?(response.code) && response.code != 429 + (400...500).cover?(response.code) && ![401, 408, 429].include?(response.code) end def failure_tracker |