aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-05-06 16:54:40 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-05-06 16:54:40 -0500
commitfbdcf5221ad7ea3d40ad09651962fc85d101dd67 (patch)
treedb217fc0a6d05ff9f28a5be2cf5edaa2f9ae8ba4 /activesupport
parent809236bc4c608e50262de4f82df79b45da1df2d4 (diff)
downloadrails-fbdcf5221ad7ea3d40ad09651962fc85d101dd67.tar.gz
rails-fbdcf5221ad7ea3d40ad09651962fc85d101dd67.tar.bz2
rails-fbdcf5221ad7ea3d40ad09651962fc85d101dd67.zip
Preparing for 5.0.0.rc1 release
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md2
-rw-r--r--activesupport/lib/active_support/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 3e07f5a032..154739a627 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 5.0.0.rc1 (May 06, 2016) ##
+
* `ActiveSupport::Duration` supports weeks and hours.
[1.hour.inspect, 1.hour.value, 1.hour.parts]
diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
index 4048133fb4..79b30abd34 100644
--- a/activesupport/lib/active_support/gem_version.rb
+++ b/activesupport/lib/active_support/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveSupport
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta4"
+ PRE = "rc1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end