diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 12:13:22 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 12:13:22 +0100 |
| commit | 48f5cecdb03f697a710169ccef1885fcaca70788 (patch) | |
| tree | fb0620965261d9a77c5ccbfb158fa86573559384 /Gemfile.lock | |
| parent | c4f8ce53b1f9af9585aeec9bbb0c66fc9c48ec1b (diff) | |
| parent | d15de0cfb86fa3cc1914892b3d16221115a42dee (diff) | |
| download | rails-48f5cecdb03f697a710169ccef1885fcaca70788.tar.gz rails-48f5cecdb03f697a710169ccef1885fcaca70788.tar.bz2 rails-48f5cecdb03f697a710169ccef1885fcaca70788.zip | |
Merge pull request #22586 from rails/merge-action-cable
Merge Action Cable into master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c39b8b049e..ab4183f916 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,14 @@ GIT PATH remote: . specs: + actioncable (5.0.0.alpha) + actionpack (= 5.0.0.alpha) + celluloid (~> 0.17.2) + coffee-rails (~> 4.1.0) + em-hiredis (~> 0.3.0) + faye-websocket (~> 0.10.0) + redis (~> 3.0) + websocket-driver (~> 0.6.1) actionmailer (5.0.0.alpha) actionpack (= 5.0.0.alpha) actionview (= 5.0.0.alpha) @@ -125,6 +133,7 @@ PATH minitest (~> 5.1) tzinfo (~> 1.1) rails (5.0.0.alpha) + actioncable (= 5.0.0.alpha) actionmailer (= 5.0.0.alpha) actionpack (= 5.0.0.alpha) actionview (= 5.0.0.alpha) @@ -191,11 +200,19 @@ GEM delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) + em-hiredis (0.3.0) + eventmachine (~> 1.0) + hiredis (~> 0.5.0) erubis (2.7.0) + eventmachine (1.0.8) 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) + hiredis (0.5.2) hitimes (1.2.3) hitimes (1.2.3-x86-mingw32) i18n (0.7.0) @@ -233,6 +250,7 @@ GEM pg (0.18.4-x64-mingw32) pg (0.18.4-x86-mingw32) psych (2.0.16) + puma (2.15.3) que (0.11.2) racc (1.4.14) rack-cache (1.5.1) @@ -313,6 +331,9 @@ GEM w3c_validators (1.2) json nokogiri + websocket-driver (0.6.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS ruby @@ -346,6 +367,7 @@ DEPENDENCIES nokogiri (>= 1.6.7) pg (>= 0.18.0) psych (~> 2.0) + puma qu-rails! qu-redis que |