about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-23 15:56:24 +0100
committerGitHub <noreply@github.com>2022-03-23 15:56:24 +0100
commit6f032076ed0f338d914d70aaa3333d4c00940c71 (patch)
tree274b9b71a73dabcdc7fb89e14b329a38a917fda0 /app/controllers/api
parent9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff)
parent6391a869aee853b01bdd9136b390e2f9b21857cb (diff)
Merge pull request #1721 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/base_controller.rb2
1 files changed, 0 insertions, 2 deletions
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