aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
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 /actioncable
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 'actioncable')
-rw-r--r--actioncable/CHANGELOG.md5
-rw-r--r--actioncable/lib/action_cable/gem_version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 0bf6246933..375fe88b2f 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.rc1 (May 06, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta4 (April 27, 2016) ##
* WebSocket protocol negotiation.
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
index 5ca2f473b1..a0c0b7969e 100644
--- a/actioncable/lib/action_cable/gem_version.rb
+++ b/actioncable/lib/action_cable/gem_version.rb
@@ -8,7 +8,7 @@ module ActionCable
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta4"
+ PRE = "rc1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end