Add latest changes from gitlab-org/security/gitlab@16-7-stable-ee

1 files changed, 4 insertions, 2 deletions

diff --git a/app/models/concerns/recoverable_by_any_email.rb b/app/models/concerns/recoverable_by_any_email.rb
index c946e7e78c6..3a56e58ca00 100644
--- a/app/models/concerns/recoverable_by_any_email.rb
+++ b/app/models/concerns/recoverable_by_any_email.rb
@@ -11,7 +11,7 @@ module RecoverableByAnyEmail
       super unless email
 
       recoverable = by_email_with_errors(email)
-      recoverable.send_reset_password_instructions(to: email) if recoverable&.persisted?
+      recoverable.send_reset_password_instructions if recoverable&.persisted?
       recoverable
     end
 
@@ -24,8 +24,10 @@ module RecoverableByAnyEmail
     end
   end
 
-  def send_reset_password_instructions(opts = {})
+  def send_reset_password_instructions
     token = set_reset_password_token
+    opts = { to: verified_emails(include_private_email: false) }
+
     send_reset_password_instructions_notification(token, opts)
 
     token