Show iids for issues/mr in email subject

app/mailers/emails/issues.rb

@@ -3,14 +3,14 @@ module Emails
     def new_issue_email(recipient_id, issue_id)
       @issue = Issue.find(issue_id)
       @project = @issue.project
-      mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title))
+      mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.iid}", @issue.title))
     end
     def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
       @issue = Issue.find(issue_id)
       @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
       @project = @issue.project
-      mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title))
+      mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.iid}", @issue.title))
     end
     def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
@@ -18,7 +18,7 @@ module Emails
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
       mail(to: recipient(recipient_id),
-           subject: subject("Closed issue ##{@issue.id}", @issue.title))
+           subject: subject("Closed issue ##{@issue.iid}", @issue.title))
     end
     def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@@ -27,7 +27,7 @@ module Emails
       @project = @issue.project
       @updated_by = User.find updated_by_user_id
       mail(to: recipient(recipient_id),
-           subject: subject("changed issue ##{@issue.id}", @issue.title))
+           subject: subject("changed issue ##{@issue.iid}", @issue.title))
     end
   end
 end

app/mailers/emails/merge_requests.rb

@@ -2,24 +2,24 @@ module Emails
   module MergeRequests
     def new_merge_request_email(recipient_id, merge_request_id)
       @merge_request = MergeRequest.find(merge_request_id)
-      mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
+      mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.iid}", @merge_request.title))
     end
     def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
-      mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title))
+      mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.iid}", @merge_request.title))
     end
     def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
       @merge_request = MergeRequest.find(merge_request_id)
       @updated_by = User.find updated_by_user_id
-      mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.id}", @merge_request.title))
+      mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.iid}", @merge_request.title))
     end
     def merged_merge_request_email(recipient_id, merge_request_id)
       @merge_request = MergeRequest.find(merge_request_id)
-      mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.id}", @merge_request.title))
+      mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.iid}", @merge_request.title))
     end
   end

spec/mailers/notify_spec.rb

@@ -110,7 +110,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
           it 'has the correct subject' do
-            should have_subject /#{project.name} \| new issue ##{issue.id} \| #{issue.title}/
+            should have_subject /#{project.name} \| new issue ##{issue.iid} \| #{issue.title}/
           end
           it 'contains a link to the new issue' do
@@ -126,7 +126,7 @@ describe Notify do
           it_behaves_like 'a multiple recipients email'
           it 'has the correct subject' do
-            should have_subject /changed issue ##{issue.id} \| #{issue.title}/
+            should have_subject /changed issue ##{issue.iid} \| #{issue.title}/
           end
           it 'contains the name of the previous assignee' do
@@ -148,7 +148,7 @@ describe Notify do
           subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
           it 'has the correct subject' do
-            should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
+            should have_subject /changed issue ##{issue.iid} \| #{issue.title}/i
           end
           it 'contains the new status' do
@@ -175,7 +175,7 @@ describe Notify do
           it_behaves_like 'an assignee email'
           it 'has the correct subject' do
-            should have_subject /new merge request !#{merge_request.id}/
+            should have_subject /new merge request !#{merge_request.iid}/
           end
           it 'contains a link to the new merge request' do
@@ -199,7 +199,7 @@ describe Notify do
           it_behaves_like 'a multiple recipients email'
           it 'has the correct subject' do
-            should have_subject /changed merge request !#{merge_request.id}/
+            should have_subject /changed merge request !#{merge_request.iid}/
           end
           it 'contains the name of the previous assignee' do