diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-30 04:21:16 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-30 04:21:16 +1030 |
| commit | 703ddadafee29c86ca5be499a80802fbea70a64f (patch) | |
| tree | fd7558a9a27970c7d494a6768bac25361a808cd6 /Gemfile.lock | |
| parent | c8818dfcdf9e92364745000eefe46132a43f8700 (diff) | |
| parent | 4d01cd1545a00ed6f96d6cb658a590afd36e1871 (diff) | |
| download | rails-703ddadafee29c86ca5be499a80802fbea70a64f.tar.gz rails-703ddadafee29c86ca5be499a80802fbea70a64f.tar.bz2 rails-703ddadafee29c86ca5be499a80802fbea70a64f.zip | |
Merge pull request #23305 from matthewd/concurrent-take-2
EventMachine -> concurrent-ruby, take two
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 04d0073800..d2d616b39d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,8 +32,7 @@ PATH actioncable (5.0.0.beta1.1) actionpack (= 5.0.0.beta1.1) coffee-rails (~> 4.1.0) - eventmachine (~> 1.0) - faye-websocket (~> 0.10.0) + nio4r (~> 1.2) websocket-driver (~> 0.6.1) actionmailer (5.0.0.beta1.1) actionpack (= 5.0.0.beta1.1) @@ -166,6 +165,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.2) mini_portile2 (~> 2.0.0.rc2) nokogiri (1.6.7.2-x64-mingw32) @@ -285,6 +285,7 @@ DEPENDENCIES delayed_job delayed_job_active_record em-hiredis + faye-websocket jquery-rails json kindlerb (= 0.1.1) |