diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-14 16:38:37 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-14 16:38:37 +0100 |
| commit | 760de782f7a7bfa3e740a0f192aedb6e5688e529 (patch) | |
| tree | 9ea09c5fd563a0a01a085a07edf41dcff33ed02f /Gemfile.lock | |
| parent | ef2744dd9431408ea086d67507ab4a6af6cd82c1 (diff) | |
| parent | bf40bddfceebaff637161be6c5d992d6978679ff (diff) | |
| download | rails-760de782f7a7bfa3e740a0f192aedb6e5688e529.tar.gz rails-760de782f7a7bfa3e740a0f192aedb6e5688e529.tar.bz2 rails-760de782f7a7bfa3e740a0f192aedb6e5688e529.zip | |
Initial stab at adding Action Cable to rails/master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d7abc12b21..a1351c28c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,6 +107,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) @@ -144,6 +152,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) @@ -210,11 +219,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) @@ -241,8 +258,13 @@ GEM mysql2 (0.4.1) nokogiri (1.6.7) mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.7-x64-mingw32) + mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.7-x86-mingw32) + mini_portile2 (~> 2.0.0.rc2) pg (0.18.3) psych (2.0.15) + puma (2.15.3) que (0.11.2) racc (1.4.13) rack-cache (1.5.0) @@ -319,6 +341,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 @@ -334,10 +359,13 @@ DEPENDENCIES bcrypt (~> 3.1.10) benchmark-ips byebug + celluloid (~> 0.17.2) coffee-rails (~> 4.1.0) dalli (>= 2.2.1) delayed_job delayed_job_active_record + em-hiredis (~> 0.3.0) + faye-websocket (~> 0.10.0) globalid! jquery-rails! json @@ -351,6 +379,7 @@ DEPENDENCIES nokogiri (>= 1.6.7) pg (>= 0.18.0) psych (~> 2.0) + puma qu-rails! qu-redis que @@ -361,6 +390,7 @@ DEPENDENCIES rails! rake (>= 10.3) redcarpet (~> 3.2.3) + redis (~> 3.0) resque resque-scheduler sass! @@ -378,6 +408,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) w3c_validators + websocket-driver (~> 0.6.1) BUNDLED WITH - 1.10.6 + 1.11.0 |