Download as
Browse Code »

Commit 11bedfe37d4a19d6aa22a45fbce6622bbbb09cb6

Authored by Philip Blatter
1 parent 06bed543
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Now using correct ids as reference if we are informing about a new note.

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/mailers/emails/notes.rb
  Diff comments   View file @11bedfe
@@ -15,7 +15,7 @@ module Emails @@ -15,7 +15,7 @@ module Emails
15 @issue = @note.noteable 15 @issue = @note.noteable
16 @project = @note.project 16 @project = @note.project
17 @target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}") 17 @target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
18 - set_reference("issue_#{@issue.iid}") 18 + set_reference("issue_#{@issue.id}")
19 mail(from: sender(@note.author_id), 19 mail(from: sender(@note.author_id),
20 to: recipient(recipient_id), 20 to: recipient(recipient_id),
21 subject: subject("#{@issue.title} (##{@issue.iid})")) 21 subject: subject("#{@issue.title} (##{@issue.iid})"))
@@ -26,7 +26,7 @@ module Emails @@ -26,7 +26,7 @@ module Emails
26 @merge_request = @note.noteable 26 @merge_request = @note.noteable
27 @project = @note.project 27 @project = @note.project
28 @target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}") 28 @target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
29 - set_reference("merge_request_#{@merge_request.iid}") 29 + set_reference("merge_request_#{@merge_request.id}")
30 mail(from: sender(@note.author_id), 30 mail(from: sender(@note.author_id),
31 to: recipient(recipient_id), 31 to: recipient(recipient_id),
32 subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 32 subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))