From fbb2fc8aa7d17fd86ad9c3fbbe60ef84a4cde950 Mon Sep 17 00:00:00 2001 From: Jimmy Bourassa Date: Thu, 24 Aug 2017 01:13:54 -0400 Subject: Fix AM::Base.default proc arity breaking change PR #29270 changed the number of arguments that gets passed to Procs defined in ActionMail::Base.default. With this changeset, Procs can now have 1 or 0 arguments Also adds test coverage for AM::Base.default Proc arity. --- actionmailer/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionmailer/CHANGELOG.md') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 9993a11c9d..6859128b24 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +* Bring back proc with arity of 1 in ActionMailer::Base.default proc + since it was supported in Rails 5.0 but not deprecated. + + *Jimmy Bourassa* + * Allow Action Mailer classes to configure their delivery job. class MyMailer < ApplicationMailer -- cgit v1.2.3 From 1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 30 Jan 2018 18:51:17 -0500 Subject: Start Rails 6.0 development!!! :tada::tada::tada: --- actionmailer/CHANGELOG.md | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'actionmailer/CHANGELOG.md') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 04bbae8495..b2a1c570e5 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,33 +1,3 @@ -* Bring back proc with arity of 1 in `ActionMailer::Base.default` proc - since it was supported in Rails 5.0 but not deprecated. - *Jimmy Bourassa* - -## Rails 5.2.0.beta2 (November 28, 2017) ## - -* No changes. - - -## 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. -- cgit v1.2.3 From d4eb0dc89ee6b476e2e10869dc282a96f956c6c7 Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Sat, 17 Feb 2018 13:02:18 -0800 Subject: Rails 6 requires Ruby 2.4.1+ Skipping over 2.4.0 to sidestep the `"symbol_from_string".to_sym.dup` bug. References #32028 --- actionmailer/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionmailer/CHANGELOG.md') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index b2a1c570e5..c5dbb0f1d4 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 6.0.0.alpha (Unreleased) ## + +* Rails 6 requires Ruby 2.4.1 or newer. + + *Jeremy Daer* Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes. -- cgit v1.2.3