aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-01-22 08:56:39 -0500
committerGitHub <noreply@github.com>2017-01-22 08:56:39 -0500
commit732ca8238b8f9686df74780896df5cd16964d4ae (patch)
treefef870796389126489aaaf9189ebb8ce21aac992
parentfb5bd3c6f2f29c3ed370e82db0d3de52a97a0648 (diff)
parent36a80b41dc67ee6ad4c544a06e6f2fe23d5463e3 (diff)
downloadrails-732ca8238b8f9686df74780896df5cd16964d4ae.tar.gz
rails-732ca8238b8f9686df74780896df5cd16964d4ae.tar.bz2
rails-732ca8238b8f9686df74780896df5cd16964d4ae.zip
Merge pull request #27764 from matrix9180/add_changelog_entry_for_27425
Add changelog entry for #27425 [ci skip]
-rw-r--r--actioncable/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 4f17274a01..7657a05077 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Redis subscription adapters now support `channel_prefix` option in `cable.yml`
+
+ Avoids channel name collisions when multiple apps use the same Redis server.
+
+ *Chad Ingram*
+
* Permit same-origin connections by default.
Added new option `config.action_cable.allow_same_origin_as_host = false`