diff options
author | Matthew Draper <matthew@trebex.net> | 2016-05-07 11:50:04 -0500 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-05-07 11:50:04 -0500 |
commit | 33f8dac38b07165e4046f99e47958e7aad053947 (patch) | |
tree | 156165ba812f77bff2265b8aa55819bfe11cbc7f /actionmailer | |
parent | 90ecb2a4c3e5bfd2410af925b1f8ecadb619f061 (diff) | |
parent | fbdcf5221ad7ea3d40ad09651962fc85d101dd67 (diff) | |
download | rails-33f8dac38b07165e4046f99e47958e7aad053947.tar.gz rails-33f8dac38b07165e4046f99e47958e7aad053947.tar.bz2 rails-33f8dac38b07165e4046f99e47958e7aad053947.zip |
Merge commit 'fbdcf5221ad7ea3d40ad09651962fc85d101dd67'
Preparing for 5.0.0.rc1 release
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/CHANGELOG.md | 5 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/gem_version.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index a271ed68f7..e916305e54 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,8 @@ +## Rails 5.0.0.rc1 (May 06, 2016) ## + +* No changes. + + ## Rails 5.0.0.beta4 (April 27, 2016) ## * Disallow calling `#deliver_later` after making local modifications to diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index d8e3a6ddbe..759b932c58 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -8,7 +8,7 @@ module ActionMailer MAJOR = 5 MINOR = 0 TINY = 0 - PRE = "beta4" + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end |