diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
| commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
| tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /railties/lib/rails/application | |
| parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
| parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
| download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip | |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
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 |