From e0733819b1c4d75e664582fc09c1b67feaa076ff Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Sun, 3 Jul 2016 18:18:59 +0000
Subject: [PATCH] Merge branch 'downgrade-redis-3-2-2' into 'master'

Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq

This affects GitLab 8.8 and 8.9. See:

* https://github.com/mperham/sidekiq/blob/master/Changes.md#413
* https://gitlab.com/gitlab-org/gitlab-ce/issues/19441

See merge request !5056
(cherry picked from commit 4b0bd4f828cbd957ab0d6b828addd294f1397252)
---
 CHANGELOG    | 1 +
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index bfbc90274a..c20f124706 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.9.5
+  - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq. !5056
   - Re-enable import button when import process fails due to namespace already being taken. !5053
   - Fix snippets comments not displayed. !5045
   - Fix emoji paths in relative root configurations. !5027
diff --git a/Gemfile.lock b/Gemfile.lock
index 9096b7f8cf..b9f61cb0d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -566,7 +566,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)