Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-01 03:07:38 +02:00
Code Issues Packages Projects Releases Activity

Merged r13784 (#14699).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-12-26 10:41:15 +00:00
parent 8beb90c5c8
commit 60d9dba5af
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mailer.rb
View File

@@ -370,7 +370,7 @@ class Mailer < ActionMailer::Base
end
def mail(headers={}, &block)
headers.merge! 'X-Mailer' => 'Redmine',
headers.reverse_merge! 'X-Mailer' => 'Redmine',
'X-Redmine-Host' => Setting.host_name,
'X-Redmine-Site' => Setting.app_title,
'X-Auto-Response-Suppress' => 'OOF',