Merge remote-tracking branch 'parent/stable-4.3' into upstream-20241005

2024-10-05 09:02:38 +09:00 · 2024-10-05 09:02:38 +09:00 · cc857e57c6
commit cc857e57c6
parent 294acdfd94 6d5aa58f88
132 changed files with 775 additions and 312 deletions
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@ -13,7 +13,7 @@ module WebAppControllerConcern
      policy = ContentSecurityPolicy.new

      if policy.sso_host.present?
-        p.form_action policy.sso_host
+        p.form_action policy.sso_host, -> { "https://#{request.host}/auth/auth/" }
      else
        p.form_action :none
      end