aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-01-15 21:07:31 +0530
committerPratik Naik <pratiknaik@gmail.com>2015-01-15 21:07:31 +0530
commita5c3a8d3e346acce79899c04133ba6fa3c88f830 (patch)
treeffc66bba74031dd021a86ae7e1b58fcfeff4e1ae /lib
parent935b73b4c132b9ef6b71054dd577cab88c0050a3 (diff)
downloadrails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.tar.gz
rails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.tar.bz2
rails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.zip
Latest gems and fix a callback bug
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable/server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index a55c3be3bc..4ee6b15982 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -11,7 +11,7 @@ module ActionCable
class << self
def register_channels(*channel_classes)
- registered_channels.merge(channel_classes)
+ self.registered_channels += channel_classes
end
end