##// END OF EJS Templates
Merged r14159 (#19558)....
Jean-Philippe Lang -
r13827:214e737ee02c
parent child
Show More
@@ -73,7 +73,6 class MailHandler < ActionMailer::Base
73
73
74 cattr_accessor :ignored_emails_headers
74 cattr_accessor :ignored_emails_headers
75 @@ignored_emails_headers = {
75 @@ignored_emails_headers = {
76 'X-Auto-Response-Suppress' => /(oof|all)/,
77 'Auto-Submitted' => /\Aauto-(replied|generated)/,
76 'Auto-Submitted' => /\Aauto-(replied|generated)/,
78 'X-Autoreply' => 'yes'
77 'X-Autoreply' => 'yes'
79 }
78 }
@@ -389,7 +389,7 class Mailer < ActionMailer::Base
389 headers.reverse_merge! 'X-Mailer' => 'Redmine',
389 headers.reverse_merge! 'X-Mailer' => 'Redmine',
390 'X-Redmine-Host' => Setting.host_name,
390 'X-Redmine-Host' => Setting.host_name,
391 'X-Redmine-Site' => Setting.app_title,
391 'X-Redmine-Site' => Setting.app_title,
392 'X-Auto-Response-Suppress' => 'OOF',
392 'X-Auto-Response-Suppress' => 'All',
393 'Auto-Submitted' => 'auto-generated',
393 'Auto-Submitted' => 'auto-generated',
394 'From' => Setting.mail_from,
394 'From' => Setting.mail_from,
395 'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
395 'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
@@ -629,7 +629,6 class MailHandlerTest < ActiveSupport::TestCase
629 def test_should_ignore_auto_replied_emails
629 def test_should_ignore_auto_replied_emails
630 MailHandler.any_instance.expects(:dispatch).never
630 MailHandler.any_instance.expects(:dispatch).never
631 [
631 [
632 "X-Auto-Response-Suppress: OOF",
633 "Auto-Submitted: auto-replied",
632 "Auto-Submitted: auto-replied",
634 "Auto-Submitted: Auto-Replied",
633 "Auto-Submitted: Auto-Replied",
635 "Auto-Submitted: auto-generated",
634 "Auto-Submitted: auto-generated",
@@ -197,7 +197,7 class MailerTest < ActiveSupport::TestCase
197 Mailer.deliver_issue_add(issue)
197 Mailer.deliver_issue_add(issue)
198 mail = last_email
198 mail = last_email
199 assert_not_nil mail
199 assert_not_nil mail
200 assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s
200 assert_equal 'All', mail.header['X-Auto-Response-Suppress'].to_s
201 assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
201 assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
202 assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
202 assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
203 end
203 end
General Comments 0
You need to be logged in to leave comments. Login now