diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 16:24:22 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 16:24:22 +0200 |
| commit | c4ae7aab6f9f66073b0200a837652df5942e9b7b (patch) | |
| tree | 39be81a1bd3270e2a32a11be3340bf26a463f858 /app/controllers/api/base_controller.rb | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
| parent | 74111bbb1c643aae516bd4bcb201052161ee725d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 109e38ffa..de8fff30e 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -14,6 +14,8 @@ class Api::BaseController < ApplicationController protect_from_forgery with: :null_session + skip_around_action :set_locale + rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| render json: { error: e.to_s }, status: 422 end |