about summary refs log tree commit diff
path: root/app/controllers/accounts_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-12 16:24:22 +0200
committerThibaut Girka <thib@sitedethib.com>2019-08-12 16:24:22 +0200
commitc4ae7aab6f9f66073b0200a837652df5942e9b7b (patch)
tree39be81a1bd3270e2a32a11be3340bf26a463f858 /app/controllers/accounts_controller.rb
parentaa485d6f055b93fd7a9df8b47ed96122b38af39e (diff)
parent74111bbb1c643aae516bd4bcb201052161ee725d (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 1aed1af8d..1a876b831 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -9,6 +9,8 @@ class AccountsController < ApplicationController
   before_action :set_cache_headers
   before_action :set_body_classes
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   def show
     respond_to do |format|
       format.html do