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

2022-05-26 22:49:47 +02:00
parent a33a0f6952 52f4e834f2
commit 7c6fff34d0
15 changed files with 61 additions and 10 deletions
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -89,7 +89,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController

  def after_confirmation_path_for(_resource_name, user)
    if user.created_by_application && truthy_param?(:redirect_to_app)
-      user.created_by_application.redirect_uri
+      user.created_by_application.confirmation_redirect_uri
    else
      super
    end