summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-11-12 15:40:22 +0000
committerRémy Coutable <remy@rymai.me>2018-11-12 15:40:22 +0000
commita407bba81a3fbd8b3313bc84e1ddf0ab4415207d (patch)
treee148455ce50ea9cc47e16cf5b1f7b0162acdde70
parent1116de5eeb27748495ead7f837ba0c63131b6df2 (diff)
parente01b1907bb720e5e9a63fd8eb61911897db6221e (diff)
downloadgitlab-ce-a407bba81a3fbd8b3313bc84e1ddf0ab4415207d.tar.gz
Merge branch 'sh-bump-redis-store' into 'master'
Bump redis-store to 1.6.0 See merge request gitlab-org/gitlab-ce!22963
-rw-r--r--Gemfile.lock2
-rw-r--r--Gemfile.rails5.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f8e8607c90e..531aefb6278 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -678,7 +678,7 @@ GEM
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
- redis-store (1.4.1)
+ redis-store (1.6.0)
redis (>= 2.2, < 5)
regexp_parser (0.5.0)
representable (3.0.4)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 247ce6c254e..be249e59280 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -687,7 +687,7 @@ GEM
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
- redis-store (1.4.1)
+ redis-store (1.6.0)
redis (>= 2.2, < 5)
regexp_parser (0.5.0)
representable (3.0.4)