diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-06 00:54:58 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-06 00:54:58 +0000 |
| commit | fa216b0e86433192ba4e39a05f42217fb4685173 (patch) | |
| tree | e65bfedac76cc5d04a8ef2e931f6fbce4e2993f8 /Gemfile.lock | |
| parent | 68221f50946e052f0cc14abde2df2b889fe73d7b (diff) | |
| parent | b5771bccc6031c3adbdee31064f1c0c981ab73d4 (diff) | |
| download | gitlab-ce-fa216b0e86433192ba4e39a05f42217fb4685173.tar.gz | |
Merge branch 'sh-use-redis-caching-store' into 'master'
Use Rails 5.2 Redis caching store
Closes #64794
See merge request gitlab-org/gitlab-ce!30966
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f89654c82fd..769af1fa20e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -741,17 +741,17 @@ GEM recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redis (3.3.5) + redis (4.1.2) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.0.4) + redis-activesupport (5.0.7) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.4) + redis-rack (2.0.5) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) @@ -1197,7 +1197,7 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 4.11) - redis (~> 3.2) + redis (~> 4.0) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) |