diff options
author | Robert Speicher <robert@gitlab.com> | 2017-12-06 19:23:29 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-14 09:16:24 +0000 |
commit | b14be0bf1c2f200c096136018000e9a77b6ca78a (patch) | |
tree | 39ff7703b15bd408fb909f183e12b1cb4b5f2418 | |
parent | ea6d3ae5a5a501bb5e874a22e066b418734f10f7 (diff) | |
download | gitlab-ce-b14be0bf1c2f200c096136018000e9a77b6ca78a.tar.gz |
Merge branch 'sh-bump-redis-actionpack' into 'master'
Bump redis-rails to 5.0.2 to get redis-store security updates
Closes #40889
See merge request gitlab-org/gitlab-ce!15773
(cherry picked from commit 6808d11b058939e61deea8c164f5b01aa19c9176)
f76aaa21 Bump redis-rails to 5.0.2 to get redis-store security updates
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 28 |
2 files changed, 15 insertions, 15 deletions
@@ -171,7 +171,7 @@ gem 're2', '~> 1.1.1' gem 'version_sorter', '~> 2.1.0' # Cache -gem 'redis-rails', '~> 5.0.1' +gem 'redis-rails', '~> 5.0.2' # Redis gem 'redis', '~> 3.2' diff --git a/Gemfile.lock b/Gemfile.lock index ae145ca5f69..1cb05861ae1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -695,24 +695,24 @@ GEM recursive-open-struct (1.0.0) redcarpet (3.4.0) redis (3.3.3) - redis-actionpack (5.0.1) + redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) - redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.1) + redis-store (>= 1.1.0, < 2) + redis-activesupport (5.0.4) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) + redis-store (>= 1.3, < 2) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (1.6.0) - rack (~> 1.5) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) - redis (>= 2.2) + redis-rack (2.0.3) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 2) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.4.1) + redis (>= 2.2, < 5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -1122,7 +1122,7 @@ DEPENDENCIES redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.5.2) - redis-rails (~> 5.0.1) + redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) rouge (~> 2.0) |