summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Blatter <philip.blatter@jamit.de>2014-03-04 15:14:38 +0100
committerPhilip Blatter <philip.blatter@jamit.de>2014-05-05 21:48:49 +0200
commit11bedfe37d4a19d6aa22a45fbce6622bbbb09cb6 (patch)
tree6a811609ee5edae2ba177b4be7f413e8a30d0211
parent06bed543e69c16d4c267d1bd49e879c3e9b761e9 (diff)
downloadgitlab-ce-11bedfe37d4a19d6aa22a45fbce6622bbbb09cb6.tar.gz
Now using correct ids as reference if we are informing about a new note.
-rw-r--r--app/mailers/emails/notes.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 43858ea0245..d2db881cfc2 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -15,7 +15,7 @@ module Emails
@issue = @note.noteable
@project = @note.project
@target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
- set_reference("issue_#{@issue.iid}")
+ set_reference("issue_#{@issue.id}")
mail(from: sender(@note.author_id),
to: recipient(recipient_id),
subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -26,7 +26,7 @@ module Emails
@merge_request = @note.noteable
@project = @note.project
@target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
- set_reference("merge_request_#{@merge_request.iid}")
+ set_reference("merge_request_#{@merge_request.id}")
mail(from: sender(@note.author_id),
to: recipient(recipient_id),
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))