summaryrefslogtreecommitdiff
path: root/app/mailers/emails/notes.rb
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@buckle.com>2013-11-08 09:04:36 -0600
committerDrew Blessing <drew.blessing@buckle.com>2013-11-08 10:20:15 -0600
commit57ad81a9c55352d39a88a5c878cc81f59f5328fa (patch)
tree0891a6da96443450f788d06fa5487fef1c0f0482 /app/mailers/emails/notes.rb
parent02484930e161f773a205bb1c1d29a8664755fd60 (diff)
downloadgitlab-ce-57ad81a9c55352d39a88a5c878cc81f59f5328fa.tar.gz
Fix minor errors/annoyances in email templates
There was some funny syntax in merge request email templates. There was a ! before the merge request number when there probably should be a #. This may be some carry over from markdown but should not be in email templates. There were also some capitalization discrepancies among the subject lines. For those OCD people out there I standardized the capitalization. :)
Diffstat (limited to 'app/mailers/emails/notes.rb')
-rw-r--r--app/mailers/emails/notes.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index ba4f0dd862c..e967cf6dc73 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -4,27 +4,27 @@ module Emails
@note = Note.find(note_id)
@commit = @note.noteable
@project = @note.project
- mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title))
+ mail(to: recipient(recipient_id), subject: subject("Note for commit #{@commit.short_id}", @commit.title))
end
def note_issue_email(recipient_id, note_id)
@note = Note.find(note_id)
@issue = @note.noteable
@project = @note.project
- mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.iid}"))
+ mail(to: recipient(recipient_id), subject: subject("Note for issue ##{@issue.iid}"))
end
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)
@note = Note.find(note_id)
@project = @note.project
- mail(to: recipient(recipient_id), subject: subject("note on wall"))
+ mail(to: recipient(recipient_id), subject: subject("Note on wall"))
end
end
end