Download as
Browse Code »

Commit 0fcd89e3ac810bb137240edf86fac5b80d52faed

Authored by Dmitriy Zaporozhets
1 parent d2aa48c0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Show iids for issues/mr in email subject

Showing 3 changed files with 13 additions and 13 deletions   Show diff stats
app/mailers/emails/issues.rb
  Diff comments   View file @0fcd89e
... ... @@ -3,14 +3,14 @@ module Emails
3 3 def new_issue_email(recipient_id, issue_id)
4 4 @issue = Issue.find(issue_id)
5 5 @project = @issue.project
6   - mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title))
  6 + mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.iid}", @issue.title))
7 7 end
8 8  
9 9 def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
10 10 @issue = Issue.find(issue_id)
11 11 @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
12 12 @project = @issue.project
13   - mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title))
  13 + mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.iid}", @issue.title))
14 14 end
15 15  
16 16 def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
... ... @@ -18,7 +18,7 @@ module Emails
18 18 @project = @issue.project
19 19 @updated_by = User.find updated_by_user_id
20 20 mail(to: recipient(recipient_id),
21   - subject: subject("Closed issue ##{@issue.id}", @issue.title))
  21 + subject: subject("Closed issue ##{@issue.iid}", @issue.title))
22 22 end
23 23  
24 24 def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
... ... @@ -27,7 +27,7 @@ module Emails
27 27 @project = @issue.project
28 28 @updated_by = User.find updated_by_user_id
29 29 mail(to: recipient(recipient_id),
30   - subject: subject("changed issue ##{@issue.id}", @issue.title))
  30 + subject: subject("changed issue ##{@issue.iid}", @issue.title))
31 31 end
32 32 end
33 33 end
... ...
app/mailers/emails/merge_requests.rb
  Diff comments   View file @0fcd89e
... ... @@ -2,24 +2,24 @@ module Emails
2 2 module MergeRequests
3 3 def new_merge_request_email(recipient_id, merge_request_id)
4 4 @merge_request = MergeRequest.find(merge_request_id)
5   - mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
  5 + mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.iid}", @merge_request.title))
6 6 end
7 7  
8 8 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
9 9 @merge_request = MergeRequest.find(merge_request_id)
10 10 @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
11   - mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title))
  11 + mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.iid}", @merge_request.title))
12 12 end
13 13  
14 14 def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
15 15 @merge_request = MergeRequest.find(merge_request_id)
16 16 @updated_by = User.find updated_by_user_id
17   - mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.id}", @merge_request.title))
  17 + mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.iid}", @merge_request.title))
18 18 end
19 19  
20 20 def merged_merge_request_email(recipient_id, merge_request_id)
21 21 @merge_request = MergeRequest.find(merge_request_id)
22   - mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.id}", @merge_request.title))
  22 + mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.iid}", @merge_request.title))
23 23 end
24 24 end
25 25  
... ...
spec/mailers/notify_spec.rb
  Diff comments   View file @0fcd89e
... ... @@ -110,7 +110,7 @@ describe Notify do
110 110 it_behaves_like 'an assignee email'
111 111  
112 112 it 'has the correct subject' do
113   - should have_subject /#{project.name} \| new issue ##{issue.id} \| #{issue.title}/
  113 + should have_subject /#{project.name} \| new issue ##{issue.iid} \| #{issue.title}/
114 114 end
115 115  
116 116 it 'contains a link to the new issue' do
... ... @@ -126,7 +126,7 @@ describe Notify do
126 126 it_behaves_like 'a multiple recipients email'
127 127  
128 128 it 'has the correct subject' do
129   - should have_subject /changed issue ##{issue.id} \| #{issue.title}/
  129 + should have_subject /changed issue ##{issue.iid} \| #{issue.title}/
130 130 end
131 131  
132 132 it 'contains the name of the previous assignee' do
... ... @@ -148,7 +148,7 @@ describe Notify do
148 148 subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
149 149  
150 150 it 'has the correct subject' do
151   - should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
  151 + should have_subject /changed issue ##{issue.iid} \| #{issue.title}/i
152 152 end
153 153  
154 154 it 'contains the new status' do
... ... @@ -175,7 +175,7 @@ describe Notify do
175 175 it_behaves_like 'an assignee email'
176 176  
177 177 it 'has the correct subject' do
178   - should have_subject /new merge request !#{merge_request.id}/
  178 + should have_subject /new merge request !#{merge_request.iid}/
179 179 end
180 180  
181 181 it 'contains a link to the new merge request' do
... ... @@ -199,7 +199,7 @@ describe Notify do
199 199 it_behaves_like 'a multiple recipients email'
200 200  
201 201 it 'has the correct subject' do
202   - should have_subject /changed merge request !#{merge_request.id}/
  202 + should have_subject /changed merge request !#{merge_request.iid}/
203 203 end
204 204  
205 205 it 'contains the name of the previous assignee' do
... ...