diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-03 08:39:11 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-03 08:39:11 +0200 |
| commit | edbef56c1fb3607315647c6115ec07d1e4e86ca0 (patch) | |
| tree | 0eee52d95ebaa663f6e3021259fd71737db4da1a | |
| parent | af34e9b0e7763e088d0c288670c03dafecc3f37f (diff) | |
| parent | 9c9f3a529ff7f982830e03653635a4401d078a46 (diff) | |
| download | rails-edbef56c1fb3607315647c6115ec07d1e4e86ca0.tar.gz rails-edbef56c1fb3607315647c6115ec07d1e4e86ca0.tar.bz2 rails-edbef56c1fb3607315647c6115ec07d1e4e86ca0.zip | |
Merge pull request #54 from lsylvester/require-to_param
Move require of to_param to 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 |