diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-23 01:05:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-23 01:05:48 +0300 |
commit | d28820e6038fcf5e40e8ee792560d38b1f0440b8 (patch) | |
tree | 88c6697bd5b07d53d2cfcdde85ffb38d8c3f0ab6 /app/models | |
parent | e6b6ac769bd034aeb14d312db923fc5a2ae1fb89 (diff) |
Add latest changes from gitlab-org/security/gitlab@16-7-stable-ee
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/recoverable_by_any_email.rb | 6 |
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 |