diff options
| author | Starfall <us@starfall.systems> | 2020-12-24 13:36:25 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-24 13:36:25 -0600 |
| commit | 6ed4e874c5ace36344f77b3f096c4089d9b11e01 (patch) | |
| tree | 83b2675d297f56a75b5e5dec33c644bc19f6cf1b /app/controllers/application_controller.rb | |
| parent | ab127fd7941b7c84e6d6fe3071d41f52affb143c (diff) | |
| parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e996c2217..41fe9d88a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,7 +29,7 @@ class ApplicationController < ActionController::Base rescue_from ActiveRecord::RecordNotFound, with: :not_found rescue_from Mastodon::NotPermittedError, with: :forbidden rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error - rescue_from Mastodon::RaceConditionError, with: :service_unavailable + rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight, with: :service_unavailable rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? |