Merge tag 'v3.1.2' into hometown-dev

2020-03-02 10:01:54 -08:00
parent 513f13e0c1 aa8568b7f2
commit 3f20f4a4ba
33 changed files with 571 additions and 394 deletions
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -9,7 +9,7 @@ class AccountsController < ApplicationController
  before_action :set_cache_headers
  before_action :set_body_classes

-  skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format) }
+  skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
  skip_before_action :require_functional!

  def show