aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2019-01-11 13:54:37 -0500
committerGitHub <noreply@github.com>2019-01-11 13:54:37 -0500
commiteedd9548ade88085a38e667a13b54fdbcde8e45b (patch)
tree604c9ef31206df9c9f1bb5b4256ae4aeef1e7536 /railties
parent5f9e0f848e83688a7f7b5c0b2285144563d84f36 (diff)
parent3f6449f4bf928a4adeb99dfb1bd146aab069cdee (diff)
downloadrails-eedd9548ade88085a38e667a13b54fdbcde8e45b.tar.gz
rails-eedd9548ade88085a38e667a13b54fdbcde8e45b.tar.bz2
rails-eedd9548ade88085a38e667a13b54fdbcde8e45b.zip
Merge pull request #34913 from bogdanvlviv/docs_config_action_mailer_delivery_job
Add info about `config.action_mailer.delivery_job` to the guide [ci skip]
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.