aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
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 /actionview
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 'actionview')
-rw-r--r--actionview/CHANGELOG.md7
-rw-r--r--actionview/lib/action_view/gem_version.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 330544ba7d..e610f77f1e 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,6 +1,11 @@
+## Rails 5.0.0.rc1 (May 06, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta4 (April 27, 2016) ##
-* `date_select` helper `:with_css_classes` option now accepts a hash of strings
+* `date_select` helper `:with_css_classes` option now accepts a hash of strings
for `:year`, `:month`, `:day`, `:hour`, `:minute`, `:second` that will extend
the select type with the given css class value.
diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
index 7f86994fd4..36eb33fbd9 100644
--- a/actionview/lib/action_view/gem_version.rb
+++ b/actionview/lib/action_view/gem_version.rb
@@ -8,7 +8,7 @@ module ActionView
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta4"
+ PRE = "rc1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end