Commit 241286a7b3b927270663abc5972666c08b13ff02
Exists in
master
and in
4 other branches
Merge pull request #4897 from rtripault/iids
[#4821] - Fix some missing iids
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/mailers/emails/notes.rb
| @@ -11,14 +11,14 @@ module Emails | @@ -11,14 +11,14 @@ module Emails | ||
| 11 | @note = Note.find(note_id) | 11 | @note = Note.find(note_id) |
| 12 | @issue = @note.noteable | 12 | @issue = @note.noteable |
| 13 | @project = @note.project | 13 | @project = @note.project |
| 14 | - mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.id}")) | 14 | + mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.iid}")) |
| 15 | end | 15 | end |
| 16 | 16 | ||
| 17 | def note_merge_request_email(recipient_id, note_id) | 17 | def note_merge_request_email(recipient_id, note_id) |
| 18 | @note = Note.find(note_id) | 18 | @note = Note.find(note_id) |
| 19 | @merge_request = @note.noteable | 19 | @merge_request = @note.noteable |
| 20 | @project = @note.project | 20 | @project = @note.project |
| 21 | - mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.id}")) | 21 | + mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.iid}")) |
| 22 | end | 22 | end |
| 23 | 23 | ||
| 24 | def note_wall_email(recipient_id, note_id) | 24 | def note_wall_email(recipient_id, note_id) |
app/views/projects/milestones/_issues.html.haml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | - issues.each do |issue| | 4 | - issues.each do |issue| |
| 5 | %li | 5 | %li |
| 6 | = link_to [@project, issue] do | 6 | = link_to [@project, issue] do |
| 7 | - %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.id} | 7 | + %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.iid} |
| 8 | = link_to_gfm truncate(issue.title, length: 40), [@project, issue] | 8 | = link_to_gfm truncate(issue.title, length: 40), [@project, issue] |
| 9 | - if issue.assignee | 9 | - if issue.assignee |
| 10 | .pull-right | 10 | .pull-right |