Merge branch 'master' into glitch-soc/merge-upstream

2019-08-12 16:24:22 +02:00 · 2019-08-12 16:24:22 +02:00 · c4ae7aab6f
commit c4ae7aab6f
parent aa485d6f05 74111bbb1c
24 changed files with 214 additions and 120 deletions
--- 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