1 files changed, 22 insertions, 2 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index dec6f7c027..4f17274a01 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,9 +1,29 @@
-*   Protect against concurrent writes to a websocket connection from
+*   Permit same-origin connections by default.
+
+    Added new option `config.action_cable.allow_same_origin_as_host = false`
+    to disable this behaviour.
+
+    *Dávid Halász*, *Matthew Draper*
+
+*   Prevent race where the client could receive and act upon a
+    subscription confirmation before the channel's `subscribed` method
+    completed.
+
+    Fixes #25381.
+
+    *Vladimir Dementyev*
+
+*   Buffer now writes to WebSocket connections, to avoid blocking threads
+    that could be doing more useful things.
+
+    *Matthew Draper*, *Tinco Andringa*
+
+*   Protect against concurrent writes to a WebSocket connection from
     multiple threads; the underlying OS write is not always threadsafe.
 
     *Tinco Andringa*
 
-*   Add ActiveSupport::Notifications hook to Broadcaster#broadcast.
+*   Add `ActiveSupport::Notifications` hook to `Broadcaster#broadcast`.
 
     *Matthew Wear*