aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-11-23 17:00:45 -0500
committerGitHub <noreply@github.com>2018-11-23 17:00:45 -0500
commit34726ad8959079fea17a2f6ea7fc2bd4864255a6 (patch)
tree59438a03e8096c5232ff1d43a55c08cc4a307f84 /actionmailer/CHANGELOG.md
parent437d20916f80eb905a1c028db4bd53304c293e61 (diff)
parent60339da5bcb76489576321fa12e665f176d8d692 (diff)
downloadrails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.gz
rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.bz2
rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.zip
Merge pull request #34367 from gmcgibbon/rm_parameterized_delivery_job
Deliver parameterized mail with DeliveryJob
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md15
1 files changed, 4 insertions, 11 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index ec6f249974..9d2a1928c5 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Deliver parameterized mail with `ActionMailer::DeliveryJob` and remove `ActionMailer::Parameterized::DeliveryJob`.
+
+ *Gannon McGibbon*
+
* Fix ActionMailer assertions not working when a Mail defines
a custom delivery job class
@@ -8,17 +12,6 @@
*Marcus Ilgner*
-* Allow ActionMailer classes to configure the parameterized delivery job
- Example:
- ```
- class MyMailer < ApplicationMailer
- self.parameterized_delivery_job = MyCustomDeliveryJob
- ...
- end
- ```
-
- *Luke Pearce*
-
* `ActionDispatch::IntegrationTest` includes `ActionMailer::TestHelper` module by default.
*Ricardo Díaz*