From 68a9060d02b1eb35c12843c0f1653809b776b35b Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Wed, 20 Jan 2016 15:54:20 +1030 Subject: Using a hacked faye-websocket, drop EventMachine --- actioncable/actioncable.gemspec | 1 - 1 file changed, 1 deletion(-) (limited to 'actioncable/actioncable.gemspec') diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec index a36acc8f6f..847fcc71c3 100644 --- a/actioncable/actioncable.gemspec +++ b/actioncable/actioncable.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |s| s.add_dependency 'actionpack', version s.add_dependency 'coffee-rails', '~> 4.1.0' - s.add_dependency 'eventmachine', '~> 1.0' s.add_dependency 'faye-websocket', '~> 0.10.0' s.add_dependency 'websocket-driver', '~> 0.6.1' -- cgit v1.2.3 From 322dca293b3716ccaa09e7e82046e539b0d2ffda Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Thu, 21 Jan 2016 14:59:11 +1030 Subject: Import the relevant portions of faye-websocket (as adapted to use concurrent-ruby / nio4r instead of eventmachine) --- actioncable/actioncable.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/actioncable.gemspec') diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec index 847fcc71c3..14f968f1ef 100644 --- a/actioncable/actioncable.gemspec +++ b/actioncable/actioncable.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency 'actionpack', version s.add_dependency 'coffee-rails', '~> 4.1.0' - s.add_dependency 'faye-websocket', '~> 0.10.0' + s.add_dependency 'nio4r', '~> 1.2' s.add_dependency 'websocket-driver', '~> 0.6.1' s.add_development_dependency 'em-hiredis', '~> 0.3.0' -- cgit v1.2.3