diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-30 01:34:47 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 00:25:45 -0600 |
| commit | 961e57f4e067bcacf460986006197ce6938ca244 (patch) | |
| tree | 58012f0513669f78935288ba2e9dfa0d8ebb8b69 /app/controllers | |
| parent | b9ed21b8f443d12ac3f8a62e536983e9cbf31d78 (diff) | |
port tootsuite#11702 to monsterfork: Fix uncaught parameter missing exceptions and missing error templates
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index ed73a9aa4..2af6da6f2 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -39,6 +39,14 @@ class Api::BaseController < ApplicationController render json: { error: 'This action is not allowed' }, status: 403 end + rescue_from Mastodon::RaceConditionError do + render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503 + end + + rescue_from ActionController::ParameterMissing do |e| + render json: { error: e.to_s }, status: 400 + end + def doorkeeper_unauthorized_render_options(error: nil) { json: { error: (error.try(:description) || 'Not authorized') } } end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 78f866650..add6b52f6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,7 +20,6 @@ class ApplicationController < ActionController::Base helper_method :use_seamless_external_login? rescue_from ActionController::RoutingError, with: :not_found - rescue_from ActiveRecord::RecordNotFound, with: :not_found rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity rescue_from ActionController::UnknownFormat, with: :not_acceptable rescue_from ActionController::ParameterMissing, with: :bad_request |