mirror of
https://github.com/redmine/redmine.git
synced 2024-08-26 05:57:38 +02:00
Merged r9358 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
86ee285eb4
commit
72ecb80dc7
@ -54,6 +54,13 @@ class MailHandler < ActionMailer::Base
|
||||
end
|
||||
return false
|
||||
end
|
||||
# Ignore out-of-office emails
|
||||
if email.header_string("X-Auto-Response-Suppress") == 'OOF'
|
||||
if logger && logger.info
|
||||
logger.info "MailHandler: ignoring out-of-office email"
|
||||
end
|
||||
return false
|
||||
end
|
||||
@user = User.find_by_mail(sender_email) if sender_email.present?
|
||||
if @user && !@user.active?
|
||||
if logger && logger.info
|
||||
|
@ -359,6 +359,15 @@ class MailHandlerTest < ActiveSupport::TestCase
|
||||
end
|
||||
end
|
||||
|
||||
def test_should_ignore_oof_emails
|
||||
raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
|
||||
raw = "X-Auto-Response-Suppress: OOF\n" + raw
|
||||
|
||||
assert_no_difference 'Issue.count' do
|
||||
assert_equal false, MailHandler.receive(raw)
|
||||
end
|
||||
end
|
||||
|
||||
def test_add_issue_should_send_email_notification
|
||||
Setting.notified_events = ['issue_added']
|
||||
ActionMailer::Base.deliveries.clear
|
||||
|
Loading…
Reference in New Issue
Block a user