summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbe Hassan <ahassan@saymedia.com>2013-10-08 11:32:26 -0700
committerAbe Hassan <ahassan@saymedia.com>2013-10-08 11:32:26 -0700
commit903090d1484408c8fe3fb91da28a6af17d3e288d (patch)
treea28f49358751c5c1117f24a1dce1e102fd273e4a
parent358426d66164d720d793ea37bacb4fc331c30171 (diff)
downloadgitlab-ce-903090d1484408c8fe3fb91da28a6af17d3e288d.tar.gz
Fix the sigil for merge request emails
-rw-r--r--app/mailers/emails/notes.rb2
-rw-r--r--spec/mailers/notify_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 761b4c8161f..ba4f0dd862c 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -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)
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 0787bdbea6f..666c6ccefff 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -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