diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-11 07:15:38 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-11 07:15:38 +0000 |
| commit | 09eef4e75c022cb4b196b6612e65a74bd8f156ed (patch) | |
| tree | b5f1bbaaa1e4ebd977304f9bac54d4421965476b /app | |
| parent | 11e8dc263f9ab8316ed152c2ff6715068cd31c14 (diff) | |
| download | redmine-09eef4e75c022cb4b196b6612e65a74bd8f156ed.tar.gz redmine-09eef4e75c022cb4b196b6612e65a74bd8f156ed.zip | |
Mail handler should not ignore emails with x-auto-response-suppress header (#19558).
Patch by Sebastian Paluch.
git-svn-id: http://svn.redmine.org/redmine/trunk@14159 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/mail_handler.rb | 1 | ||||
| -rw-r--r-- | app/models/mailer.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 4b63ac53d..88a2e6dbc 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -73,7 +73,6 @@ class MailHandler < ActionMailer::Base cattr_accessor :ignored_emails_headers @@ignored_emails_headers = { - 'X-Auto-Response-Suppress' => /(oof|all)/, 'Auto-Submitted' => /\Aauto-(replied|generated)/, 'X-Autoreply' => 'yes' } diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 9953ea509..4bfa45b0b 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -389,7 +389,7 @@ class Mailer < ActionMailer::Base headers.reverse_merge! 'X-Mailer' => 'Redmine', 'X-Redmine-Host' => Setting.host_name, 'X-Redmine-Site' => Setting.app_title, - 'X-Auto-Response-Suppress' => 'OOF', + 'X-Auto-Response-Suppress' => 'All', 'Auto-Submitted' => 'auto-generated', 'From' => Setting.mail_from, 'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>" |