From c981575ca85d1cd4c686bde714741c455073a91e Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Wed, 6 Dec 2017 19:23:29 +0000
Subject: [PATCH] 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
---
Gemfile | 2 +-
Gemfile.lock | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Gemfile b/Gemfile
index 35e2ca8c2afa..01a25fdfc341 100644
--- a/Gemfile
+++ b/Gemfile
@@ -181,7 +181,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 f5a0f83ac59d..aa9c05c16af2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -728,24 +728,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)
@@ -1168,7 +1168,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)
--
GitLab