diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2017-09-28 21:54:00 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2017-10-08 15:37:54 -0700 |
| commit | 53c516d88d48bafee5bd125a368352dd94f5fdad (patch) | |
| tree | fcf21f1bd6ef63146964fbb530cc7700d0176e75 /Gemfile.lock | |
| parent | f165628cdf9a6d857ea6eeca02ed6c950b250df5 (diff) | |
| download | rails-53c516d88d48bafee5bd125a368352dd94f5fdad.tar.gz rails-53c516d88d48bafee5bd125a368352dd94f5fdad.tar.bz2 rails-53c516d88d48bafee5bd125a368352dd94f5fdad.zip | |
redis-rb 4.0 support
* Use `gem 'redis', '~> 4.0'` for new app Gemfiles
* Loosen Action Cable redis-rb dep to `>= 3.3, < 5`
* Bump redis-namespace for looser Redis version dep
* Avoid using the underlying `redis.client` directly
* Use `Redis.new` instead of `Redis.connect`
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 938b4a71cc..5ed069c13c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,6 +7,17 @@ GIT pg (>= 0.17, < 0.20) GIT + remote: https://github.com/jeremy/resque-scheduler.git + revision: 5efd21bb7ee4b326d9c0d26fccad10fc59dd51f0 + branch: redis-rb-4.0 + specs: + resque-scheduler (4.3.0) + mono_logger (~> 1.0) + redis (>= 3.3, < 5) + resque (~> 1.26) + rufus-scheduler (~> 3.2) + +GIT remote: https://github.com/matthewd/rb-inotify.git revision: 856730aad4b285969e8dd621e44808a7c5af4242 branch: close-handling @@ -24,6 +35,16 @@ GIT websocket GIT + remote: https://github.com/mperham/sidekiq.git + revision: 6332b9f8a316cf1000246701e40e108d16fed6d4 + specs: + sidekiq (5.0.5) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) + redis (>= 3.3.4, < 5) + +GIT remote: https://github.com/rails/arel.git revision: 42510bf71472e2e35d9becb546edd05562672344 specs: @@ -42,6 +63,13 @@ GIT tilt (>= 1.1, < 3) GIT + remote: https://github.com/resque/redis-namespace.git + revision: 1403f511f6ae1ec9a8f330298a4cacf73fb10afc + specs: + redis-namespace (1.5.3) + redis (>= 3.0.4) + +GIT remote: https://github.com/robin850/sdoc.git revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c branch: upgrade @@ -361,9 +389,7 @@ GEM rb-fsevent (0.10.2) rdoc (5.1.0) redcarpet (3.2.3) - redis (3.3.3) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) + redis (4.0.1) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -374,11 +400,6 @@ GEM redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-scheduler (4.3.0) - mono_logger (~> 1.0) - redis (~> 3.3) - resque (~> 1.26) - rufus-scheduler (~> 3.2) retriable (3.1.1) rubocop (0.49.1) parallel (~> 1.10) @@ -403,11 +424,6 @@ GEM sequel (4.49.0) serverengine (1.5.11) sigdump (~> 0.2.2) - sidekiq (5.0.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) sigdump (0.2.4) signet (0.7.3) addressable (~> 2.3) @@ -520,14 +536,15 @@ DEPENDENCIES rake (>= 11.1) rb-inotify! redcarpet (~> 3.2.3) - redis + redis (~> 4.0) + redis-namespace! resque - resque-scheduler + resque-scheduler! rubocop (>= 0.47) sass-rails! sdoc! sequel - sidekiq + sidekiq! sneakers sprockets-export sqlite3 (~> 1.3.6) |