summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2016-01-09 19:32:03 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2016-01-09 19:32:03 +0100
commit26cedc7e0bd83fc488da3a4dc5265d395639215f (patch)
treed50a46a486267e84ff112d4745c89757be1b6d49 /app/mailers
parent36d858bcf98868426256ce51a28e7029b38e0c2d (diff)
downloadgitlab-ce-26cedc7e0bd83fc488da3a4dc5265d395639215f.tar.gz
Minor improvements, unsubscribe from email footer
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/notes.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index ccd33b880f7..f9650df9a74 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -1,7 +1,7 @@
module Emails
module Notes
def note_commit_email(recipient_id, note_id)
- note_mail_with_notification(note_id, recipient_id)
+ setup_note_mail(note_id, recipient_id)
@commit = @note.noteable
@target_url = namespace_project_commit_url(*note_target_url_options)
@@ -13,7 +13,7 @@ module Emails
end
def note_issue_email(recipient_id, note_id)
- note_mail_with_notification(note_id, recipient_id)
+ setup_note_mail(note_id, recipient_id)
@issue = @note.noteable
@target_url = namespace_project_issue_url(*note_target_url_options)
@@ -21,7 +21,7 @@ module Emails
end
def note_merge_request_email(recipient_id, note_id)
- note_mail_with_notification(note_id, recipient_id)
+ setup_note_mail(note_id, recipient_id)
@merge_request = @note.noteable
@target_url = namespace_project_merge_request_url(*note_target_url_options)
@@ -42,7 +42,7 @@ module Emails
}
end
- def note_mail_with_notification(note_id, recipient_id)
+ def setup_note_mail(note_id, recipient_id)
@note = Note.find(note_id)
@project = @note.project