diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-10-10 17:13:09 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-10-10 17:13:09 +0000 |
| commit | 0c78056a69cc3bee7fb1cd3261046995db55bfdf (patch) | |
| tree | 67883c68edad43b2e6f96e9ea8b864370a6b207c /app/controllers/admin_controller.rb | |
| parent | 5533eeff239e024539f3ddd5b2ffe3528144beef (diff) | |
| download | redmine-0c78056a69cc3bee7fb1cd3261046995db55bfdf.tar.gz redmine-0c78056a69cc3bee7fb1cd3261046995db55bfdf.zip | |
Send emails asynchronously (#26791).
Custom async_* delivery methods are removed in favor of ActiveJob (Async by default).
git-svn-id: http://svn.redmine.org/redmine/trunk@17588 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index dfc73c5ab..885c3a169 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -60,16 +60,12 @@ class AdminController < ApplicationController end def test_email - raise_delivery_errors = ActionMailer::Base.raise_delivery_errors - # Force ActionMailer to raise delivery errors so we can catch it - ActionMailer::Base.raise_delivery_errors = true begin - @test = Mailer.test_email(User.current).deliver + Mailer.deliver_test_email(User.current) flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail)) rescue Exception => e flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))) end - ActionMailer::Base.raise_delivery_errors = raise_delivery_errors redirect_to settings_path(:tab => 'notifications') end |