diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 10:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 10:31:28 +0100 |
| commit | 72335694744da87cbfaff20992cb36817f6f8a60 (patch) | |
| tree | 55c1b799be04cf83f425414dce762bf9403e2b85 /app/controllers/api/base_controller.rb | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | c31e756644120cab650452e9d1c00a1e2f26ade4 (diff) | |
Merge pull request #1923 from ClearlyClaire/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 3f3e1ca7b..665425f29 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -57,7 +57,7 @@ class Api::BaseController < ApplicationController render json: { error: I18n.t('errors.429') }, status: 429 end - rescue_from ActionController::ParameterMissing do |e| + rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e| render json: { error: e.to_s }, status: 400 end |