diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-03-22 12:29:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 12:29:04 +0100 |
| commit | 67d550830b3b1a9a2b65b1ab98ea4bcd491666c5 (patch) | |
| tree | 309da029b31b2228268a6681bccdadda257d192b /app | |
| parent | 410989e081b812d6f025489ab589428f987d26c0 (diff) | |
Fix locale not being set in REST API (#17847)
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/activitypub/base_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb index 4cbc3ab8f..196d85a32 100644 --- a/app/controllers/activitypub/base_controller.rb +++ b/app/controllers/activitypub/base_controller.rb @@ -2,6 +2,7 @@ class ActivityPub::BaseController < Api::BaseController skip_before_action :require_authenticated_user! + skip_around_action :set_locale private diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 72c30dec7..d96285b44 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -15,8 +15,6 @@ 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 |