aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-06-08 14:09:53 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-06-08 14:09:53 +0200
commit84c90bbdfc75ebadc66f8d00efb2a2d268192a20 (patch)
tree6d5bc63fb0361214fb97ffc6098670a0a1835eb8 /guides
parentc32e36d05c04b87d2f1bfbe313360e5664d82fe5 (diff)
parentf0b9ebc43b77b210a2fc6a5b70c9201e998ca3f3 (diff)
downloadrails-84c90bbdfc75ebadc66f8d00efb2a2d268192a20.tar.gz
rails-84c90bbdfc75ebadc66f8d00efb2a2d268192a20.tar.bz2
rails-84c90bbdfc75ebadc66f8d00efb2a2d268192a20.zip
Merge pull request #25323 from vipulnsward/ac-release-notes
Add Action Cable introduction to release notes
Diffstat (limited to 'guides')
-rw-r--r--guides/source/5_0_release_notes.md15
1 files changed, 13 insertions, 2 deletions
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index a07ce7e859..71861d079e 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -37,9 +37,20 @@ Major Features
--------------
### Action Cable
-[Pull Request](https://github.com/rails/rails/pull/22586)
-ToDo...
+Action Cable is a new framework in Rails 5. It seamlessly integrates
+[WebSockets](https://en.wikipedia.org/wiki/WebSocket) with the rest of your
+Rails application.
+
+Action Cable allows for real-time features to be written in Ruby in the
+same style and form as the rest of your Rails application, while still being
+performant and scalable. It's a full-stack offering that provides both a
+client-side JavaScript framework and a server-side Ruby framework. You have
+access to your full domain model written with Active Record or your ORM of
+choice.
+
+See the [Active Cable Overview](action_cable_overview.html) guide for more
+information.
### Rails API
[Pull Request](https://github.com/rails/rails/pull/19832)