Commit ace9ff4a46d2cc97446fb984d86c3e468ff2e661
Exists in
master
and in
4 other branches
Merge pull request #5305 from saymedia/master
Fix the sigil for merge request emails
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/mailers/emails/notes.rb
| @@ -18,7 +18,7 @@ module Emails | @@ -18,7 +18,7 @@ module Emails | ||
| 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.iid}")) | 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) |
spec/mailers/notify_spec.rb
| @@ -320,7 +320,7 @@ describe Notify do | @@ -320,7 +320,7 @@ describe Notify do | ||
| 320 | it_behaves_like 'a note email' | 320 | it_behaves_like 'a note email' |
| 321 | 321 | ||
| 322 | it 'has the correct subject' do | 322 | it 'has the correct subject' do |
| 323 | - should have_subject /note for merge request !#{merge_request.iid}/ | 323 | + should have_subject /note for merge request ##{merge_request.iid}/ |
| 324 | end | 324 | end |
| 325 | 325 | ||
| 326 | it 'contains a link to the merge request note' do | 326 | it 'contains a link to the merge request note' do |