From 9c9f3a529ff7f982830e03653635a4401d078a46 Mon Sep 17 00:00:00 2001
From: Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au>
Date: Sun, 2 Aug 2015 19:22:18 +1000
Subject: move the require of object/to_param to channel/broadcasting because
 that is where it is needed.

---
 lib/action_cable.rb                      | 1 -
 lib/action_cable/channel/broadcasting.rb | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index 6c1627a694..13c5c77578 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -8,7 +8,6 @@ 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'
diff --git a/lib/action_cable/channel/broadcasting.rb b/lib/action_cable/channel/broadcasting.rb
index ee4117bc0a..afc23d7d1a 100644
--- a/lib/action_cable/channel/broadcasting.rb
+++ b/lib/action_cable/channel/broadcasting.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/to_param'
+
 module ActionCable
   module Channel
     module Broadcasting
-- 
cgit v1.2.3