diff options
author | Robert Speicher <robert@gitlab.com> | 2016-04-19 19:23:41 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-04-19 19:23:41 +0300 |
commit | 7b09bab68e0ccc4990218ee91211577d4d109703 (patch) | |
tree | 41eff0f769b91654bd3d917cdcecff30ecc70770 /app/mailers | |
parent | 18a8844fa06191367bbf0f5179c94272d2d1cb1a (diff) | |
parent | b68e3925ffac4e8ffa376e25786c5dcaa915d75a (diff) |
Merge branch 'mr-formatting' into 'master'
use ! rather than # for merge request references
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278
See merge request !3740
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/notes.rb | 2 |
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 |