mirror of
https://github.com/redmine/redmine.git
synced 2026-01-08 16:42:54 +01:00
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
This commit is contained in:
@@ -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'
|
||||
}
|
||||
|
||||
@@ -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('@', '.')}>"
|
||||
|
||||
@@ -629,7 +629,6 @@ class MailHandlerTest < ActiveSupport::TestCase
|
||||
def test_should_ignore_auto_replied_emails
|
||||
MailHandler.any_instance.expects(:dispatch).never
|
||||
[
|
||||
"X-Auto-Response-Suppress: OOF",
|
||||
"Auto-Submitted: auto-replied",
|
||||
"Auto-Submitted: Auto-Replied",
|
||||
"Auto-Submitted: auto-generated",
|
||||
|
||||
@@ -197,7 +197,7 @@ class MailerTest < ActiveSupport::TestCase
|
||||
Mailer.deliver_issue_add(issue)
|
||||
mail = last_email
|
||||
assert_not_nil mail
|
||||
assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s
|
||||
assert_equal 'All', mail.header['X-Auto-Response-Suppress'].to_s
|
||||
assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
|
||||
assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user