aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-12-12 14:32:15 -0500
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2019-01-07 17:38:21 -0500
commite5f2d2906a395dcac0afd1abc268ca7f061765b8 (patch)
treebed6233fb6a98b1e660d7cffdbc8a84df59acd6e /railties/lib/rails/application
parent9cfcc067e626f0f1e220cc00a9f96622a936350d (diff)
downloadrails-e5f2d2906a395dcac0afd1abc268ca7f061765b8.tar.gz
rails-e5f2d2906a395dcac0afd1abc268ca7f061765b8.tar.bz2
rails-e5f2d2906a395dcac0afd1abc268ca7f061765b8.zip
Move MailDeliveryJob default to 6.0 defaults
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7dcdad2ac9..3595f60bf8 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -130,6 +130,10 @@ module Rails
action_dispatch.use_cookies_with_metadata = true
end
+ if respond_to?(:action_mailer)
+ action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+ end
+
if respond_to?(:active_job)
active_job.return_false_on_aborted_enqueue = true
end