aboutsummaryrefslogtreecommitdiffstats
path: root/guides
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 /guides
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 'guides')
-rw-r--r--guides/source/configuring.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 3a7baf84a9..32682fb91f 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -721,6 +721,8 @@ There are a number of settings available on `config.action_mailer`:
* `config.action_mailer.perform_caching` specifies whether the mailer templates should perform fragment caching or not. By default this is `false` in all environments.
+* `config.action_mailer.delivery_job` specifies delivery job for mail. Defaults to `ActionMailer::DeliveryJob`.
+
### Configuring Active Support
@@ -905,6 +907,7 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla
- `config.action_view.default_enforce_utf8`: `false`
- `config.action_dispatch.use_cookies_with_metadata`: `true`
+- `config.action_mailer.delivery_job`: `"ActionMailer::MailDeliveryJob"`
- `config.active_job.return_false_on_aborted_enqueue`: `true`
- `config.active_storage.queues.analysis`: `:active_storage_analysis`
- `config.active_storage.queues.purge`: `:active_storage_purge`