diff options
| author | Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au> | 2015-08-02 19:22:18 +1000 |
|---|---|---|
| committer | Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au> | 2015-08-02 19:22:18 +1000 |
| commit | 9c9f3a529ff7f982830e03653635a4401d078a46 (patch) | |
| tree | 92eb1444f67be1219e7d6cd8ec2a1d6c0fe72def | |
| parent | 01ca41e5fced4a358b4ceb62e14f8c091c21cce1 (diff) | |
| download | rails-9c9f3a529ff7f982830e03653635a4401d078a46.tar.gz rails-9c9f3a529ff7f982830e03653635a4401d078a46.tar.bz2 rails-9c9f3a529ff7f982830e03653635a4401d078a46.zip | |
move the require of object/to_param to channel/broadcasting because that is where it is needed.
| -rw-r--r-- | lib/action_cable.rb | 1 | ||||
| -rw-r--r-- | lib/action_cable/channel/broadcasting.rb | 2 |
2 files changed, 2 insertions, 1 deletions
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 |