Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-07-15 15:25:11 +0400
committerMarin Jankovski <marin@gitlab.com>2014-07-15 15:25:11 +0400
commit56398ea1611b4bf1b3e27cc057ffb049e78e5173 (patch)
treea43e14e102c8a1bf3e7a86ac97fc9b6fb2bf2170 /app/mailers/emails
parent275a5281d5f35bf2243a0b5814b8fb83f1561105 (diff)
Do not sent a generated password via email for admin created user.
Diffstat (limited to 'app/mailers/emails')
-rw-r--r--app/mailers/emails/profile.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index f02d95fd557..4498b30691f 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -1,9 +1,10 @@
module Emails
module Profile
- def new_user_email(user_id, password)
+ def new_user_email(user_id, password, token)
@user = User.find(user_id)
@password = password
@target_url = user_url(@user)
+ @token = token
mail(to: @user.email, subject: subject("Account was created for you"))
end