summaryrefslogtreecommitdiff
path: root/app/mailers/notify.rb
diff options
context:
space:
mode:
authorAleks Bunin <github@compuix.com>2015-02-07 12:35:50 -0500
committerAleks Bunin <github@compuix.com>2015-02-07 12:35:50 -0500
commit36b255e57bae0dbfbb0e1767713bdd713c48d622 (patch)
treeb23680b81fb6230cf54a70d8b8462ec4b27abc21 /app/mailers/notify.rb
parent5bf33f977c16757dbf669fe2b25b09da406508dd (diff)
downloadgitlab-ce-36b255e57bae0dbfbb0e1767713bdd713c48d622.tar.gz
Addex X-GitLab-Project header to GitLab emails.
Fixes #8748.
Diffstat (limited to 'app/mailers/notify.rb')
-rw-r--r--app/mailers/notify.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 5ae07d771fa..3b7152cb771 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -111,6 +111,7 @@ class Notify < ActionMailer::Base
# See: mail_answer_thread
def mail_new_thread(model, headers = {}, &block)
headers['Message-ID'] = message_id(model)
+ headers['X-GitLab-Project'] = "#{@project.name} | " if @project
mail(headers, &block)
end
@@ -125,6 +126,7 @@ class Notify < ActionMailer::Base
def mail_answer_thread(model, headers = {}, &block)
headers['In-Reply-To'] = message_id(model)
headers['References'] = message_id(model)
+ headers['X-GitLab-Project'] = "#{@project.name} | " if @project
if (headers[:subject])
headers[:subject].prepend('Re: ')