aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/actioncable.gemspec
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-01-27 14:33:15 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-01-27 14:33:15 +0100
commit9ea7aa84d16d99fd32ed1877e3fd6631a41e7042 (patch)
treeccc4bdf086f9c8d54c40a38213787e212da1af2b /actioncable/actioncable.gemspec
parent92039d7c7bacfe5747f96047e80f0e8ceb481f62 (diff)
downloadrails-9ea7aa84d16d99fd32ed1877e3fd6631a41e7042.tar.gz
rails-9ea7aa84d16d99fd32ed1877e3fd6631a41e7042.tar.bz2
rails-9ea7aa84d16d99fd32ed1877e3fd6631a41e7042.zip
Revert "Eliminate the EventMachine dependency"
Diffstat (limited to 'actioncable/actioncable.gemspec')
-rw-r--r--actioncable/actioncable.gemspec3
1 files changed, 2 insertions, 1 deletions
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec
index 14f968f1ef..a36acc8f6f 100644
--- a/actioncable/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
s.add_dependency 'actionpack', version
s.add_dependency 'coffee-rails', '~> 4.1.0'
- s.add_dependency 'nio4r', '~> 1.2'
+ s.add_dependency 'eventmachine', '~> 1.0'
+ s.add_dependency 'faye-websocket', '~> 0.10.0'
s.add_dependency 'websocket-driver', '~> 0.6.1'
s.add_development_dependency 'em-hiredis', '~> 0.3.0'