diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 10:35:56 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 10:35:56 +0200 |
| commit | 0c833498678603e2fd222a2f6386418822ce0a19 (patch) | |
| tree | 53eebd325693d42276392d44da6e2dd9f6eef768 /app/mailers | |
| parent | ee028d9d60522f8993a0b2429ac8a0631d59229a (diff) | |
| parent | d2c90d7494e8ca6b37d4ce57b2bc08f8b1175c4b (diff) | |
| download | gitlab-ce-0c833498678603e2fd222a2f6386418822ce0a19.tar.gz | |
Merge branch 'master' into rename-reply-by-email
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/notes.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 63d4aca61af..87ba94a583d 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -12,7 +12,7 @@ module Emails to: recipient(recipient_id), subject: subject("#{@commit.title} (#{@commit.short_id})")) - SentNotification.record(@commit, recipient_id, reply_key) + SentNotification.record_note(@note, recipient_id, reply_key) end def note_issue_email(recipient_id, note_id) @@ -27,7 +27,7 @@ module Emails to: recipient(recipient_id), subject: subject("#{@issue.title} (##{@issue.iid})")) - SentNotification.record(@issue, recipient_id, reply_key) + SentNotification.record_note(@note, recipient_id, reply_key) end def note_merge_request_email(recipient_id, note_id) @@ -43,7 +43,7 @@ module Emails to: recipient(recipient_id), subject: subject("#{@merge_request.title} (##{@merge_request.iid})")) - SentNotification.record(@merge_request, recipient_id, reply_key) + SentNotification.record_note(@note, recipient_id, reply_key) end end end |