diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-02-07 00:23:58 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-02-07 23:19:17 +0100 |
commit | 9dbd7e5aec921e43f3ea89c8e3357ca0174b0937 (patch) | |
tree | da089409d276cb6b048c52cb91a4d74f829ffda1 /app/mailers/emails | |
parent | bc57ff0ef023db3d07f1adfa6a309fb4a24ed203 (diff) | |
download | gitlab-ce-9dbd7e5aec921e43f3ea89c8e3357ca0174b0937.tar.gz |
Allow notification email to be set separately from primary email.
Closes #1932.
Diffstat (limited to 'app/mailers/emails')
-rw-r--r-- | app/mailers/emails/profile.rb | 6 | ||||
-rw-r--r-- | app/mailers/emails/projects.rb | 2 |
2 files changed, 4 insertions, 4 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 diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index d6edfd7059f..dc2ebc969c1 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -12,7 +12,7 @@ module Emails @user = User.find user_id @project = Project.find project_id @target_url = project_url(@project) - mail(to: @user.email, + mail(to: @user.notification_email, subject: subject("Project was moved")) end |