diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-21 14:59:11 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:52:40 +1030 |
| commit | 322dca293b3716ccaa09e7e82046e539b0d2ffda (patch) | |
| tree | 512383f2375ff948a085183c74c3da2848f58069 /Gemfile.lock | |
| parent | 68a9060d02b1eb35c12843c0f1653809b776b35b (diff) | |
| download | rails-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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3467c23d6f..61b90d305c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,16 +20,6 @@ GIT redis-namespace GIT - remote: git://github.com/matthewd/faye-websocket-ruby.git - revision: f608bb57844b91b397817b06ab6bf744324010ab - branch: no-em-concept - specs: - faye-websocket (0.10.2) - concurrent-ruby (~> 1.0) - nio4r (~> 1.2) - websocket-driver (>= 0.5.1) - -GIT remote: git://github.com/sass/sass.git revision: bce9509f396225d721501ea1070a6871b708abb1 branch: stable @@ -42,7 +32,7 @@ PATH actioncable (5.0.0.beta1) actionpack (= 5.0.0.beta1) coffee-rails (~> 4.1.0) - faye-websocket (~> 0.10.0) + nio4r (~> 1.2) websocket-driver (~> 0.6.1) actionmailer (5.0.0.beta1) actionpack (= 5.0.0.beta1) @@ -314,7 +304,6 @@ DEPENDENCIES delayed_job delayed_job_active_record em-hiredis - faye-websocket! jquery-rails json kindlerb (= 0.1.1) |