diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-20 16:03:13 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-20 16:09:20 +1030 |
| commit | 56a9341689942146d350ff931497956a15152bdb (patch) | |
| tree | b667657e63aed80d1c04b8fd08223812c5e870e7 /Gemfile.lock | |
| parent | 8f208e0f90cafda767005bc1fce63709414e84dd (diff) | |
| parent | ae31da20cd250154c951b67d5625fc71ac27e2f1 (diff) | |
| download | rails-56a9341689942146d350ff931497956a15152bdb.tar.gz rails-56a9341689942146d350ff931497956a15152bdb.tar.bz2 rails-56a9341689942146d350ff931497956a15152bdb.zip | |
Merge pull request #22950 from maclover7/adapterize-storage-actioncable
Adapterize storage for ActionCable
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bcedeff385..6b29d2c44b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,9 +32,8 @@ PATH actioncable (5.0.0.beta1) actionpack (= 5.0.0.beta1) coffee-rails (~> 4.1.0) - em-hiredis (~> 0.3.0) + eventmachine (~> 1.0) faye-websocket (~> 0.10.0) - redis (~> 3.0) websocket-driver (~> 0.6.1) actionmailer (5.0.0.beta1) actionpack (= 5.0.0.beta1) @@ -140,9 +139,6 @@ 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.9.1) execjs (2.6.0) @@ -154,7 +150,6 @@ GEM ffi (1.9.10-x86-mingw32) globalid (0.3.6) activesupport (>= 4.1.0) - hiredis (0.5.2) hitimes (1.2.3) hitimes (1.2.3-x86-mingw32) i18n (0.7.0) |