aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2019-01-10 13:54:13 +0000
committerbogdanvlviv <bogdanvlviv@gmail.com>2019-01-11 12:48:42 +0000
commit3f6449f4bf928a4adeb99dfb1bd146aab069cdee (patch)
tree3c384e68d4b1ed16c8046de7eef1beed7d7c203d /railties
parent7aaf9b8076704426c5e3f20bc3018c398f58dc88 (diff)
downloadrails-3f6449f4bf928a4adeb99dfb1bd146aab069cdee.tar.gz
rails-3f6449f4bf928a4adeb99dfb1bd146aab069cdee.tar.bz2
rails-3f6449f4bf928a4adeb99dfb1bd146aab069cdee.zip
Add info about `config.action_mailer.delivery_job` to the guide [ci skip]
Also, add mention to `new_framework_defaults_6_0.rb` that `ActionMailer::Parameterized::DeliveryJob` is default for parameterized mail and will be removed. Related to #34692
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
index a3aca27500..d25552e923 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
@@ -25,8 +25,8 @@
# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
#
-# The default delivery job (ActionMailer::DeliveryJob), will be removed in Rails 6.1.
-# This setting is not backwards compatible with earlier Rails versions.
+# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
+# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
# If you send mail in the background, job workers need to have a copy of
# MailDeliveryJob to ensure all delivery jobs are processed properly.
# Make sure your entire app is migrated and stable on 6.0 before using this setting.