about summary refs log tree commit diff
path: root/app/controllers/concerns/web_app_controller_concern.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-05 18:44:15 +0100
committerGitHub <noreply@github.com>2023-01-05 18:44:15 +0100
commitad17e1944aa4c01c5637199b464c9d78b7e54af2 (patch)
treedee9d23334a0d23fbc3737e3c17033727805a141 /app/controllers/concerns/web_app_controller_concern.rb
parent7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff)
parentc4649ae9d4ef34cc0bad9d5df0da8e8b6c729522 (diff)
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/concerns/web_app_controller_concern.rb')
-rw-r--r--app/controllers/concerns/web_app_controller_concern.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index b6050c913..23c008803 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -4,8 +4,8 @@ module WebAppControllerConcern
   extend ActiveSupport::Concern
 
   included do
+    prepend_before_action :redirect_unauthenticated_to_permalinks!
     before_action :set_pack
-    before_action :redirect_unauthenticated_to_permalinks!
     before_action :set_app_body_class
     before_action :set_referrer_policy_header
   end
@@ -19,7 +19,7 @@ module WebAppControllerConcern
   end
 
   def redirect_unauthenticated_to_permalinks!
-    return if user_signed_in?
+    return if user_signed_in? # NOTE: Different from upstream because we allow moved users to log in
 
     redirect_path = PermalinkRedirector.new(request.path).redirect_path