aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-01-18 15:42:12 -0500
commit5a0230c67f852fb21173f99647e76336897446c1 (patch)
tree229177305a322ef5edbd9b0526976ec8f0c76391 /actionmailer
parentea83132e0eeb6988f9211d5b5cbe4b99f2b9982e (diff)
downloadrails-5a0230c67f852fb21173f99647e76336897446c1.tar.gz
rails-5a0230c67f852fb21173f99647e76336897446c1.tar.bz2
rails-5a0230c67f852fb21173f99647e76336897446c1.zip
Preparing for 6.0.0.beta1 release
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 06b4744d31..806e428481 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 6.0.0.beta1 (January 18, 2019) ##
+
* Deprecate `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
*George Claghorn*
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index 72eb5d61e8..4cab52d1f3 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -10,7 +10,7 @@ module ActionMailer
MAJOR = 6
MINOR = 0
TINY = 0
- PRE = "alpha"
+ PRE = "beta1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end