1 files changed, 24 insertions, 22 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index bfc229d795..d70d32ce07 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,35 +1,37 @@
-*  Added ActionCable::SubscriptionAdapter::EventedRedis.em_redis_connector/redis_connector and
-   ActionCable::SubscriptionAdapter::Redis.redis_connector factory methods for redis connections, 
-   so you can overwrite with your own initializers. This is used when you want to use different-than-standard Redis adapters,
-   like for Makara distributed Redis.
+*   Permit same-origin connections by default.
 
-   *DHH*
+    New option `config.action_cable.allow_same_origin_as_host = false`
+    to disable.
 
-## Rails 5.0.0.beta2 (February 01, 2016) ##
+    *Dávid Halász*, *Matthew Draper*
 
-*   Support PostgreSQL pubsub adapter.
+*   Prevent race where the client could receive and act upon a
+    subscription confirmation before the channel's `subscribed` method
+    completed.
 
-    *Jon Moss*
+    Fixes #25381.
 
-*   Remove EventMachine dependency.
+    *Vladimir Dementyev*
 
-    *Matthew Draper*
+*   Buffer writes to websocket connections, to avoid blocking threads
+    that could be doing more useful things.
 
-*   Remove Celluloid dependency.
+    *Matthew Draper*, *Tinco Andringa*
 
-    *Mike Perham*
+*   Protect against concurrent writes to a websocket connection from
+    multiple threads; the underlying OS write is not always threadsafe.
 
-*   Create notion of an `ActionCable::SubscriptionAdapter`.
-    Separate out Redis functionality into
-    `ActionCable::SubscriptionAdapter::Redis`, and add a
-    PostgreSQL adapter as well. Configuration file for
-    ActionCable was changed from`config/redis/cable.yml` to
-    `config/cable.yml`.
+    *Tinco Andringa*
 
-   *Jon Moss*
+*   Add ActiveSupport::Notifications hook to Broadcaster#broadcast.
 
-## Rails 5.0.0.beta1 (December 18, 2015) ##
+    *Matthew Wear*
 
-*   Added to Rails!
+*   Close hijacked socket when connection is shut down.
 
-    *DHH*
+    Fixes #25613.
+
+    *Tinco Andringa*
+
+
+Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.