aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-07-30 20:59:12 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-07-30 20:59:12 +0200
commit01ca41e5fced4a358b4ceb62e14f8c091c21cce1 (patch)
tree730fd4cca29d47c07b0719aa73bbea642f1acd3a /lib
parent219c48e18b10bebbefb1c12d94278f3e0d94a0b5 (diff)
parent92b0a993909f6f413a5486017f6401b5845762d0 (diff)
downloadrails-01ca41e5fced4a358b4ceb62e14f8c091c21cce1.tar.gz
rails-01ca41e5fced4a358b4ceb62e14f8c091c21cce1.tar.bz2
rails-01ca41e5fced4a358b4ceb62e14f8c091c21cce1.zip
Merge pull request #49 from jasondew/channel_broadcasting_test_fix
Fixes test failure in ActionCable::Channel::BroadcastingTest when run by itself
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index 13c5c77578..6c1627a694 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -8,6 +8,7 @@ require 'active_support/json'
require 'active_support/concern'
require 'active_support/core_ext/hash/indifferent_access'
require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/to_param'
require 'active_support/callbacks'
require 'faye/websocket'