summaryrefslogtreecommitdiff
path: root/app/mailers/notify.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-07 00:23:58 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-07 23:19:17 +0100
commit9dbd7e5aec921e43f3ea89c8e3357ca0174b0937 (patch)
treeda089409d276cb6b048c52cb91a4d74f829ffda1 /app/mailers/notify.rb
parentbc57ff0ef023db3d07f1adfa6a309fb4a24ed203 (diff)
downloadgitlab-ce-9dbd7e5aec921e43f3ea89c8e3357ca0174b0937.tar.gz
Allow notification email to be set separately from primary email.
Closes #1932.
Diffstat (limited to 'app/mailers/notify.rb')
-rw-r--r--app/mailers/notify.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 5ae07d771fa..45fc53fcdb2 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -60,7 +60,7 @@ class Notify < ActionMailer::Base
# Returns a String containing the User's email address.
def recipient(recipient_id)
if recipient = User.find(recipient_id)
- recipient.email
+ recipient.notification_email
end
end