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

2020-02-19 23:04:18 +01:00
parent 955f838f9d ff3a11d01d
commit e037002401
16 changed files with 276 additions and 214 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