diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:30:48 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:30:48 +1030 |
| commit | dcdadd5e82eed2e64d21399599b14501c3e16cc3 (patch) | |
| tree | 1ec70f6e5357ee6ac58c0913ad67bf046ded7e17 /Gemfile.lock | |
| parent | e3a0ad83da16f5fb063ce7d254b4e466baf7199d (diff) | |
| parent | 9ff28c10ebad0d4781603499a3e3b1d7fd5fbd2c (diff) | |
| download | rails-dcdadd5e82eed2e64d21399599b14501c3e16cc3.tar.gz rails-dcdadd5e82eed2e64d21399599b14501c3e16cc3.tar.bz2 rails-dcdadd5e82eed2e64d21399599b14501c3e16cc3.zip | |
Merge pull request #23217 from matthewd/adapter-tests
ActionCable Adapter tests
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6b29d2c44b..0789c59905 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,6 +139,9 @@ 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) @@ -150,6 +153,7 @@ 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) @@ -302,6 +306,7 @@ DEPENDENCIES dalli (>= 2.2.1) delayed_job delayed_job_active_record + em-hiredis jquery-rails json kindlerb (= 0.1.1) @@ -322,6 +327,7 @@ DEPENDENCIES rails! rake (>= 10.3) redcarpet (~> 3.2.3) + redis resque resque-scheduler sass! |