Commit ace9ff4a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5305 from saymedia/master

Fix the sigil for merge request emails
parents 627cb28f 903090d1
No related merge requests found
......@@ -18,7 +18,7 @@ module Emails
@note = Note.find(note_id)
@merge_request = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.iid}"))
mail(to: recipient(recipient_id), subject: subject("note for merge request ##{@merge_request.iid}"))
end
def note_wall_email(recipient_id, note_id)
......
......@@ -320,7 +320,7 @@ describe Notify do
it_behaves_like 'a note email'
it 'has the correct subject' do
should have_subject /note for merge request !#{merge_request.iid}/
should have_subject /note for merge request ##{merge_request.iid}/
end
it 'contains a link to the merge request note' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment