diff options
author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 10:35:11 -0400 |
---|---|---|
committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:48:03 -0400 |
commit | 539c70c7d64589656cce804282725b97e28e49ff (patch) | |
tree | c181018c64097323006b2d303b810fdb99035997 /app/mailers | |
parent | d99594273d57b2d5ed7c748b3185712960b89478 (diff) | |
download | gitlab-ce-539c70c7d64589656cce804282725b97e28e49ff.tar.gz |
Update emails to describe path using for_fork?
Forked MR's will print
Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>
Non forked MR's will print
Branch <source_branch> -> <target_branch>
Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
-rw-r--r-- | app/mailers/notify.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 06ccce7f895..cf6950966e1 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -23,7 +23,6 @@ module Emails end end - # Over rides default behavour to show source/target # Formats arguments into a String suitable for use as an email subject # @@ -63,4 +62,5 @@ module Emails subject << " | " + extra.join(' | ') if extra.present? subject end + end diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index a5aa97ab13d..7890ca7793b 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -6,6 +6,7 @@ class Notify < ActionMailer::Base add_template_helper ApplicationHelper add_template_helper GitlabMarkdownHelper + add_template_helper MergeRequestsHelper default_url_options[:host] = Gitlab.config.gitlab.host default_url_options[:protocol] = Gitlab.config.gitlab.protocol |