diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-08 18:59:16 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 18:59:16 +1030 |
| commit | 3785e9aec73208aa95b7c1da5246ef673e4221e0 (patch) | |
| tree | ab93506bb25ce9aa41c72a913f3bb46524eb21ce | |
| parent | 534ac99ab1dad03ca7e173365902f913743c81b3 (diff) | |
| parent | cfe46db8e29bbd0b14e4111ea8e37ea74be058d5 (diff) | |
| download | rails-3785e9aec73208aa95b7c1da5246ef673e4221e0.tar.gz rails-3785e9aec73208aa95b7c1da5246ef673e4221e0.tar.bz2 rails-3785e9aec73208aa95b7c1da5246ef673e4221e0.zip | |
Merge pull request #31086 from y-yagi/use_released_redis_namespace
Use released `redis-namespace` instead of master version
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 4 insertions, 10 deletions
@@ -80,8 +80,7 @@ group :cable do gem "hiredis", require: false gem "redis", "~> 4.0", require: false - # For Redis 4.0 support. Unreleased 9cb81bf. - gem "redis-namespace", github: "resque/redis-namespace" + gem "redis-namespace" gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false diff --git a/Gemfile.lock b/Gemfile.lock index cc3b0508c5..d0bfe589be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,13 +53,6 @@ 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 @@ -409,6 +402,8 @@ GEM rdoc (5.1.0) redcarpet (3.2.3) redis (4.0.1) + redis-namespace (1.6.0) + redis (>= 3.0.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -563,7 +558,7 @@ DEPENDENCIES rb-inotify! redcarpet (~> 3.2.3) redis (~> 4.0) - redis-namespace! + redis-namespace resque resque-scheduler! rubocop (>= 0.47) |