diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-20 15:54:20 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:51:06 +1030 |
| commit | 68a9060d02b1eb35c12843c0f1653809b776b35b (patch) | |
| tree | cde309fbbd468e972a1e01df4f50c1d2bbe119b4 /Gemfile.lock | |
| parent | dcdadd5e82eed2e64d21399599b14501c3e16cc3 (diff) | |
| download | rails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.gz rails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.bz2 rails-68a9060d02b1eb35c12843c0f1653809b776b35b.zip | |
Using a hacked faye-websocket, drop EventMachine
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0789c59905..3467c23d6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,6 +20,16 @@ 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 @@ -32,7 +42,6 @@ PATH actioncable (5.0.0.beta1) actionpack (= 5.0.0.beta1) coffee-rails (~> 4.1.0) - eventmachine (~> 1.0) faye-websocket (~> 0.10.0) websocket-driver (~> 0.6.1) actionmailer (5.0.0.beta1) @@ -145,9 +154,6 @@ GEM erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.6.0) - faye-websocket (0.10.2) - eventmachine (>= 0.12.0) - websocket-driver (>= 0.5.1) ffi (1.9.10) ffi (1.9.10-x64-mingw32) ffi (1.9.10-x86-mingw32) @@ -185,6 +191,7 @@ GEM mysql2 (0.4.2) mysql2 (0.4.2-x64-mingw32) mysql2 (0.4.2-x86-mingw32) + nio4r (1.2.0) nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) nokogiri (1.6.7.1-x64-mingw32) @@ -307,6 +314,7 @@ DEPENDENCIES delayed_job delayed_job_active_record em-hiredis + faye-websocket! jquery-rails json kindlerb (= 0.1.1) |