diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-15 18:19:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 18:19:20 +0100 |
| commit | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (patch) | |
| tree | 070a16d495d962a1f4efb9e196fae18803cf3835 /app/controllers/api/base_controller.rb | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | b0722fbc14cf1cee412c3524c51705c9902bde7f (diff) | |
Merge pull request #1476 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index fe199e689..85f4cc768 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -40,7 +40,7 @@ class Api::BaseController < ApplicationController render json: { error: 'This action is not allowed' }, status: 403 end - rescue_from Mastodon::RaceConditionError do + rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight do render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503 end |