diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-21 10:28:18 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-21 10:28:18 -0800 |
| commit | 3bd34fcceed2f4ec78c1bf0134d3c8b97c34c5a9 (patch) | |
| tree | 5f6d2d3e64e96d073c7e835ed801eccd3683f797 | |
| parent | 3afffebe215c54fff73d1023c7214c755f71ac6f (diff) | |
| parent | 3e304e8177bc1fd81d9d8db15eaf252cf386e22f (diff) | |
| download | rails-3bd34fcceed2f4ec78c1bf0134d3c8b97c34c5a9.tar.gz rails-3bd34fcceed2f4ec78c1bf0134d3c8b97c34c5a9.tar.bz2 rails-3bd34fcceed2f4ec78c1bf0134d3c8b97c34c5a9.zip | |
Merge branch 'master' into activestorage-guide
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 1 insertions, 9 deletions
@@ -74,7 +74,6 @@ end group :cable do gem "puma", require: false - gem "em-hiredis", require: false gem "hiredis", require: false gem "redis", "~> 4.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index f02dfa8f60..075f8c2b0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -216,9 +216,6 @@ GEM activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) digest-crc (0.4.1) - em-hiredis (0.3.1) - eventmachine (~> 1.0) - hiredis (~> 0.6.0) em-http-request (1.1.5) addressable (>= 2.3.4) cookiejar (!= 0.3.1) @@ -232,9 +229,6 @@ GEM tzinfo event_emitter (0.2.6) eventmachine (1.2.5) - eventmachine (1.2.5-java) - eventmachine (1.2.5-x64-mingw32) - eventmachine (1.2.5-x86-mingw32) execjs (2.7.0) faraday (0.13.1) multipart-post (>= 1.2, < 3) @@ -371,7 +365,7 @@ GEM rack (>= 0.4) rack-protection (2.0.0) rack - rack-test (0.7.1) + rack-test (0.8.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -523,7 +517,6 @@ DEPENDENCIES dalli (>= 2.2.1) delayed_job delayed_job_active_record - em-hiredis google-cloud-storage (~> 1.3) hiredis json (>= 2.0.0) |