aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-30 18:51:17 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-30 18:51:17 -0500
commit1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7 (patch)
treed7534ff5a19ff20a996b381c047bb3b2004decdb /actionmailer
parentbec74e1d4a05eb18eaf0dea9506b43569fd5cd05 (diff)
downloadrails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.tar.gz
rails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.tar.bz2
rails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.zip
Start Rails 6.0 development!!!
:tada::tada::tada:
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md32
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb6
2 files changed, 4 insertions, 34 deletions
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.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index 6a7dd0a212..72eb5d61e8 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -7,10 +7,10 @@ module ActionMailer
end
module VERSION
- MAJOR = 5
- MINOR = 2
+ MAJOR = 6
+ MINOR = 0
TINY = 0
- PRE = "beta2"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end