summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-01-05 14:03:01 +0000
committerRémy Coutable <remy@rymai.me>2018-01-05 14:03:01 +0000
commit7acfdaabfd39f2fb310feb6ab840d27d45b935a4 (patch)
treea0c76ca41be10ab27b141fe3c2b93b551ac601dc
parente74908244f4e45c468a041cf40d22880f6bd5a32 (diff)
parentc4600805b58e4fc705a6733cd92fa5518a267e9f (diff)
downloadgitlab-ce-7acfdaabfd39f2fb310feb6ab840d27d45b935a4.tar.gz
Merge branch 'update-redis-rack' into 'master'
Update redis-rack to 2.0.4 See merge request gitlab-org/gitlab-ce!16251
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/update-redis-rack.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c510a6da2d7..2a81c81b0f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -718,7 +718,7 @@ GEM
redis-store (>= 1.3, < 2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
- redis-rack (2.0.3)
+ redis-rack (2.0.4)
rack (>= 1.5, < 3)
redis-store (>= 1.2, < 2)
redis-rails (5.0.2)
diff --git a/changelogs/unreleased/update-redis-rack.yml b/changelogs/unreleased/update-redis-rack.yml
new file mode 100644
index 00000000000..6e2e6e203b8
--- /dev/null
+++ b/changelogs/unreleased/update-redis-rack.yml
@@ -0,0 +1,5 @@
+---
+title: Update redis-rack to 2.0.4
+merge_request:
+author:
+type: other