Fix locale not being set in REST API (#17847)

3 years ago · 41816c8bfa
parent eabcc9f888
commit 41816c8bfa
2 changed files with 1 additions and 2 deletions
--- 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
--- 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