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/services
parent275a5281d5f35bf2243a0b5814b8fb83f1561105 (diff)
Do not sent a generated password via email for admin created user.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notification_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index e934c486c75..36d33e0d7ca 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -105,9 +105,9 @@ class NotificationService
end
# Notify new user with email after creation
- def new_user(user)
+ def new_user(user, token = nil)
# Don't email omniauth created users
- mailer.new_user_email(user.id, user.password) unless user.extern_uid?
+ mailer.new_user_email(user.id, user.password, token) unless user.extern_uid?
end
# Notify users on new note in system