From 26525064a8623851f1047bbf0f00ee9061cabe9e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 1 Jul 2016 12:51:21 -0700
Subject: [PATCH] Downgrade to Redis 3.2.2 due to massive memory leak with
 Sidekiq

See:

https://github.com/mperham/sidekiq/blob/master/Changes.md#413
https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
---
 CHANGELOG    | 1 +
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2f93fcdbaa0..85c785270e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.9.5 (unreleased)
   - Improve the request / withdraw access button. !4860
   - Fix assigning shared runners as admins. !4961
   - Show "locked" label for locked runners on runners admin. !4961
+  - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
   - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
   - Fix import button disabled when import process fail due to the namespace already been taken.
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 45cb327168c..b8022d31040 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -554,7 +554,7 @@ GEM
     recaptcha (3.0.0)
       json
     redcarpet (3.3.3)
-    redis (3.3.0)
+    redis (3.2.2)
     redis-actionpack (4.0.1)
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
-- 
GitLab