Commit 241286a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4897 from rtripault/iids

[#4821] - Fix some missing iids
parents 17af8353 3d8f38c6
...@@ -11,14 +11,14 @@ module Emails ...@@ -11,14 +11,14 @@ module Emails
@note = Note.find(note_id) @note = Note.find(note_id)
@issue = @note.noteable @issue = @note.noteable
@project = @note.project @project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.id}")) mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.iid}"))
end end
def note_merge_request_email(recipient_id, note_id) def note_merge_request_email(recipient_id, note_id)
@note = Note.find(note_id) @note = Note.find(note_id)
@merge_request = @note.noteable @merge_request = @note.noteable
@project = @note.project @project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.id}")) mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.iid}"))
end end
def note_wall_email(recipient_id, note_id) def note_wall_email(recipient_id, note_id)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- issues.each do |issue| - issues.each do |issue|
%li %li
= link_to [@project, issue] do = link_to [@project, issue] do
%span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.id} %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.iid}
= link_to_gfm truncate(issue.title, length: 40), [@project, issue] = link_to_gfm truncate(issue.title, length: 40), [@project, issue]
- if issue.assignee - if issue.assignee
.pull-right .pull-right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment