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 /activesupport | |
| 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 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/gem_version.rb | 2 |
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 |