aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-05-07 11:50:04 -0500
committerMatthew Draper <matthew@trebex.net>2016-05-07 11:50:04 -0500
commit33f8dac38b07165e4046f99e47958e7aad053947 (patch)
tree156165ba812f77bff2265b8aa55819bfe11cbc7f /actionpack
parent90ecb2a4c3e5bfd2410af925b1f8ecadb619f061 (diff)
parentfbdcf5221ad7ea3d40ad09651962fc85d101dd67 (diff)
downloadrails-33f8dac38b07165e4046f99e47958e7aad053947.tar.gz
rails-33f8dac38b07165e4046f99e47958e7aad053947.tar.bz2
rails-33f8dac38b07165e4046f99e47958e7aad053947.zip
Merge commit 'fbdcf5221ad7ea3d40ad09651962fc85d101dd67'
Preparing for 5.0.0.rc1 release
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--actionpack/lib/action_pack/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 49866d0d03..f753c44029 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 5.0.0.rc1 (May 06, 2016) ##
+
* Add `ActionController#helpers` to get access to the view context at the controller
level.
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
index 0fa51fa0fe..bbb637166e 100644
--- a/actionpack/lib/action_pack/gem_version.rb
+++ b/actionpack/lib/action_pack/gem_version.rb
@@ -8,7 +8,7 @@ module ActionPack
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta4"
+ PRE = "rc1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end