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:
authorDouwe Maan <douwe@gitlab.com>2015-02-07 02:23:58 +0300
committerDouwe Maan <douwe@gitlab.com>2015-02-08 01:19:17 +0300
commit9dbd7e5aec921e43f3ea89c8e3357ca0174b0937 (patch)
treeda089409d276cb6b048c52cb91a4d74f829ffda1 /app/mailers/emails/profile.rb
parentbc57ff0ef023db3d07f1adfa6a309fb4a24ed203 (diff)
Allow notification email to be set separately from primary email.
Closes #1932.
Diffstat (limited to 'app/mailers/emails/profile.rb')
-rw-r--r--app/mailers/emails/profile.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index 6d7f8eb4b02..ab5b0765352 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -4,20 +4,20 @@ module Emails
@user = User.find(user_id)
@target_url = user_url(@user)
@token = token
- mail(to: @user.email, subject: subject("Account was created for you"))
+ mail(to: @user.notification_email, subject: subject("Account was created for you"))
end
def new_email_email(email_id)
@email = Email.find(email_id)
@user = @email.user
- mail(to: @user.email, subject: subject("Email was added to your account"))
+ mail(to: @user.notification_email, subject: subject("Email was added to your account"))
end
def new_ssh_key_email(key_id)
@key = Key.find(key_id)
@user = @key.user
@target_url = user_url(@user)
- mail(to: @user.email, subject: subject("SSH key was added to your account"))
+ mail(to: @user.notification_email, subject: subject("SSH key was added to your account"))
end
end
end