kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #8749 from sashkab/b8748-emailheader 

Addex X-GitLab-Project header to GitLab emails.
This commit is contained in:
Dmitriy Zaporozhets 2015-02-08 01:06:38 -08:00
parent 64673acf9f 36b255e57b
commit 8c12c93e07
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/notify.rb
View File

@ -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: ')

2
spec/mailers/notify_spec.rb
View File

@ -31,6 +31,7 @@ describe Notify do
shared_examples 'an email starting a new thread' do |message_id_prefix|
it 'has a discussion identifier' do
should have_header 'Message-ID', /<#{message_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
should have_header 'X-GitLab-Project', /#{project.name}/
end
end
@ -42,6 +43,7 @@ describe Notify do
it 'has headers that reference an existing thread' do
should have_header 'References', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
should have_header 'In-Reply-To', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
should have_header 'X-GitLab-Project', /#{project.name}/
end
end