summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-02 12:18:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-02 12:18:53 +0000
commit51d59a3538b97d85ebb46039044d3f498809b55a (patch)
treed574af08cc1e2ef8fa8337a0850fa36a7b9ab527 /app/controllers
parent74da249f7e22c20e144ba3c044c6bdeb5df86cd4 (diff)
downloadgitlab-ce-51d59a3538b97d85ebb46039044d3f498809b55a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/verifies_with_email.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/verifies_with_email.rb b/app/controllers/concerns/verifies_with_email.rb
index fb48c0d8ba5..45869c05f41 100644
--- a/app/controllers/concerns/verifies_with_email.rb
+++ b/app/controllers/concerns/verifies_with_email.rb
@@ -78,7 +78,7 @@ module VerifiesWithEmail
def send_verification_instructions(user)
return if send_rate_limited?(user)
- service = Users::EmailVerification::GenerateTokenService.new(attr: :unlock_token)
+ service = Users::EmailVerification::GenerateTokenService.new(attr: :unlock_token, user: user)
raw_token, encrypted_token = service.execute
user.unlock_token = encrypted_token
user.lock_access!({ send_instructions: false })