aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
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*