Commit 4b0bd4f8 authored by Robert Speicher's avatar Robert Speicher

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
parents 95336861 26525064
...@@ -36,6 +36,7 @@ v 8.9.5 (unreleased) ...@@ -36,6 +36,7 @@ v 8.9.5 (unreleased)
- Improve the request / withdraw access button. !4860 - Improve the request / withdraw access button. !4860
- Fix assigning shared runners as admins. !4961 - Fix assigning shared runners as admins. !4961
- Show "locked" label for locked runners on runners admin. !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 - 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. - Fix import button disabled when import process fail due to the namespace already been taken.
- Security: Update RedCloth to 4.3.2 (Takuya Noguchi) - Security: Update RedCloth to 4.3.2 (Takuya Noguchi)
......
...@@ -554,7 +554,7 @@ GEM ...@@ -554,7 +554,7 @@ GEM
recaptcha (3.0.0) recaptcha (3.0.0)
json json
redcarpet (3.3.3) redcarpet (3.3.3)
redis (3.3.0) redis (3.2.2)
redis-actionpack (4.0.1) redis-actionpack (4.0.1)
actionpack (~> 4) actionpack (~> 4)
redis-rack (~> 1.5.0) redis-rack (~> 1.5.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment