aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md27
1 files changed, 4 insertions, 23 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 2836f0cfbc..c5dbb0f1d4 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,27 +1,8 @@
-## Rails 5.2.0.beta2 (November 28, 2017) ##
+## Rails 6.0.0.alpha (Unreleased) ##
-* No changes.
+* Rails 6 requires Ruby 2.4.1 or newer.
+ *Jeremy Daer*
-## Rails 5.2.0.beta1 (November 27, 2017) ##
-* Add `assert_enqueued_email_with` test helper.
-
- assert_enqueued_email_with ContactMailer, :welcome do
- ContactMailer.welcome.deliver_later
- end
-
- *Mikkel Malmberg*
-
-* Allow Action Mailer classes to configure their delivery job.
-
- class MyMailer < ApplicationMailer
- self.delivery_job = MyCustomDeliveryJob
-
- ...
- end
-
- *Matthew Mongeau*
-
-
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes.