From 60d9dba5af19bb4544600d8c73e54d43a219b220 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 26 Dec 2014 10:41:15 +0000 Subject: [PATCH] Merged r13784 (#14699). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 8be6f83fd..f59dadc57 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -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', -- 2.39.5