about summary refs log tree commit diff
path: root/app/controllers/accounts_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-20 00:52:50 +0100
committerGitHub <noreply@github.com>2020-02-20 00:52:50 +0100
commit668098303284b0aa0f1dcfddc280ed1b6fb435bb (patch)
treed5b47229d14d496ec48a9f7ad303acdcc5054841 /app/controllers/accounts_controller.rb
parent955f838f9df9a6af4ba2ab51716def6093698c28 (diff)
parentbc4de2f66117b5eac8ebe4a389ad9915c471b0c5 (diff)
Merge pull request #1287 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index c4ee22847..ee48da177 100644
--- 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