summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2016-04-18 23:32:02 -0700
committerBen Bodenmiller <bbodenmiller@hotmail.com>2016-04-18 23:32:02 -0700
commitb68e3925ffac4e8ffa376e25786c5dcaa915d75a (patch)
tree3801afa5239dc310aa1b8e267e742afe25677f47 /app/mailers
parent5048064dc5e7ca30f65209c7ccd9fb90f9ac49db (diff)
downloadgitlab-ce-b68e3925ffac4e8ffa376e25786c5dcaa915d75a.tar.gz
format merge request references properly
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/merge_requests.rb2
-rw-r--r--app/mailers/emails/notes.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 55bb4f65270..9dd11d20ea6 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -56,7 +56,7 @@ module Emails
{
from: sender(sender_id),
to: recipient(recipient_id),
- subject: subject("#{@merge_request.title} (##{@merge_request.iid})")
+ subject: subject("#{@merge_request.title} (#{@merge_request.to_reference})")
}
end
end
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index f9650df9a74..cdc40b81ee1 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -38,7 +38,7 @@ module Emails
{
from: sender(@note.author_id),
to: recipient(recipient_id),
- subject: subject("#{@note.noteable.title} (##{@note.noteable.iid})")
+ subject: subject("#{@note.noteable.title} (#{@note.noteable.to_reference})")
}
end