diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-11 17:22:56 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-11 17:22:56 +0100 |
| commit | a86d50633939efead3a057302210dc25ee614b2f (patch) | |
| tree | 44b9355919fb6eadd957ed9f932f58312dc7cc75 /lib/action_cable | |
| parent | cf4d9aa992f99ca19fd32446d081ba7d145fbeae (diff) | |
| parent | 952887a8bd1fc1e197a482b01c6b1b1ccbcdba2d (diff) | |
| download | rails-a86d50633939efead3a057302210dc25ee614b2f.tar.gz rails-a86d50633939efead3a057302210dc25ee614b2f.tar.bz2 rails-a86d50633939efead3a057302210dc25ee614b2f.zip | |
Merge pull request #115 from habermann24/master
Fix an error when using multiple gid identifiers
Diffstat (limited to 'lib/action_cable')
| -rw-r--r-- | lib/action_cable/connection/identification.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/action_cable/connection/identification.rb b/lib/action_cable/connection/identification.rb index 431493aa70..2d75ff8d6d 100644 --- a/lib/action_cable/connection/identification.rb +++ b/lib/action_cable/connection/identification.rb @@ -34,8 +34,8 @@ module ActionCable private def connection_gid(ids) ids.map do |o| - if o.respond_to? :to_global_id - o.to_global_id + if o.respond_to? :to_gid_param + o.to_gid_param else o.to_s end |