aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md5
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
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