aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/actioncable.gemspec
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-01-21 14:59:11 +1030
committerMatthew Draper <matthew@trebex.net>2016-01-24 22:52:40 +1030
commit322dca293b3716ccaa09e7e82046e539b0d2ffda (patch)
tree512383f2375ff948a085183c74c3da2848f58069 /actioncable/actioncable.gemspec
parent68a9060d02b1eb35c12843c0f1653809b776b35b (diff)
downloadrails-322dca293b3716ccaa09e7e82046e539b0d2ffda.tar.gz
rails-322dca293b3716ccaa09e7e82046e539b0d2ffda.tar.bz2
rails-322dca293b3716ccaa09e7e82046e539b0d2ffda.zip
Import the relevant portions of faye-websocket
(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
Diffstat (limited to 'actioncable/actioncable.gemspec')
-rw-r--r--actioncable/actioncable.gemspec2
1 files changed, 1 insertions, 1 deletions
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'