Download as
Browse Code »

Commit 903090d1484408c8fe3fb91da28a6af17d3e288d

Authored by Abe Hassan
1 parent 358426d6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @903090d
... ... @@ -18,7 +18,7 @@ module Emails
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.iid}"))
  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)
... ...
spec/mailers/notify_spec.rb
  Diff comments   View file @903090d
... ... @@ -320,7 +320,7 @@ describe Notify do
320 320 it_behaves_like 'a note email'
321 321  
322 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 324 end
325 325  
326 326 it 'contains a link to the merge request note' do
... ...