Merge pull request gitlabhq#5305 from saymedia/master

Fix the sigil for merge request emails

Author: dzaporozhets

Diff for: app/mailers/emails/notes.rb

@@ -18,7 +18,7 @@ def note_merge_request_email(recipient_id, note_id)
       @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)

Diff for: spec/mailers/notify_spec.rb

@@ -320,7 +320,7 @@
         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