diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-24 16:00:15 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-24 16:00:15 +0100 |
| commit | 53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc (patch) | |
| tree | 631e1157afb6bfe4e0e5c4ffdc4a69ef6a713f1b /actioncable/actioncable.gemspec | |
| parent | 3bebb65e86baac1792499c94679a4d4a0cc4acbd (diff) | |
| parent | 503fe757c7f5f917deab95acdcd421a1dede05c7 (diff) | |
| download | rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.tar.gz rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.tar.bz2 rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.zip | |
Merge pull request #23152 from matthewd/actioncable-concurrent
Eliminate the EventMachine dependency
Diffstat (limited to 'actioncable/actioncable.gemspec')
| -rw-r--r-- | actioncable/actioncable.gemspec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec index a36acc8f6f..14f968f1ef 100644 --- a/actioncable/actioncable.gemspec +++ b/actioncable/actioncable.gemspec @@ -21,8 +21,7 @@ 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 'nio4r', '~> 1.2' s.add_dependency 'websocket-driver', '~> 0.6.1' s.add_development_dependency 'em-hiredis', '~> 0.3.0' |