Download as
Browse Code »

Commit 241286a7b3b927270663abc5972666c08b13ff02

Authored by Dmitriy Zaporozhets
2 parents 17af8353 3d8f38c6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @241286a
... ... @@ -11,14 +11,14 @@ module Emails
11 11 @note = Note.find(note_id)
12 12 @issue = @note.noteable
13 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 15 end
16 16  
17 17 def note_merge_request_email(recipient_id, note_id)
18 18 @note = Note.find(note_id)
19 19 @merge_request = @note.noteable
20 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 22 end
23 23  
24 24 def note_wall_email(recipient_id, note_id)
... ...
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @241286a
... ... @@ -4,7 +4,7 @@
4 4 - issues.each do |issue|
5 5 %li
6 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 8 = link_to_gfm truncate(issue.title, length: 40), [@project, issue]
9 9 - if issue.assignee
10 10 .pull-right
... ...