From e95e598b43d4468107b23097e44700275d11af5e Mon Sep 17 00:00:00 2001 From: Jan Habermann Date: Thu, 5 Nov 2015 23:38:44 +0100 Subject: Fix an error when using multiple gid identifiers --- lib/action_cable/connection/identification.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/connection/identification.rb b/lib/action_cable/connection/identification.rb index 431493aa70..76cb7d5ea1 100644 --- a/lib/action_cable/connection/identification.rb +++ b/lib/action_cable/connection/identification.rb @@ -35,7 +35,7 @@ module ActionCable def connection_gid(ids) ids.map do |o| if o.respond_to? :to_global_id - o.to_global_id + o.to_global_id.to_s else o.to_s end -- cgit v1.2.3 From 952887a8bd1fc1e197a482b01c6b1b1ccbcdba2d Mon Sep 17 00:00:00 2001 From: Jan Habermann Date: Wed, 18 Nov 2015 12:15:18 +0100 Subject: Use to_gid_param for connection identifiers --- lib/action_cable/connection/identification.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/connection/identification.rb b/lib/action_cable/connection/identification.rb index 76cb7d5ea1..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.to_s + if o.respond_to? :to_gid_param + o.to_gid_param else o.to_s end -- cgit v1.2.3