diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-05 17:16:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-05 17:16:54 +0000 |
| commit | a70b57b73c55bb14564b65fa6f57d8ea5e49cd90 (patch) | |
| tree | 1caac52f5a90c00675c4d0e6b551f850729a5210 | |
| parent | 36afec5fcf7f103541d99e3144e486b3fb1bc8fc (diff) | |
| parent | 280ea4f600f9084d16d84fdaf57bf54830787fe3 (diff) | |
| download | gitlab-ce-a70b57b73c55bb14564b65fa6f57d8ea5e49cd90.tar.gz | |
Merge branch 'bump-sidekiq-4.1.2' into 'master'
Upgrade Sidekiq to 4.1.2
Fixes a memory leak: https://github.com/mperham/sidekiq/commit/a2bdb875fe495bc28b1bee80120e4a5641ca0731
See merge request !4056
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index bcb3ecec26c..8bc554efbe8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.8.0 (unreleased) - Project#open_branches has been cleaned up and no longer loads entire records into memory. - Log to application.log when an admin starts and stops impersonating a user - Make build status canceled if any of the jobs was canceled and none failed + - Upgrade Sidekiq to 4.1.2 - Sanitize repo paths in new project error message - Bump mail_room to 0.7.0 to fix stuck IDLE connections - Remove future dates from contribution calendar graph. diff --git a/Gemfile.lock b/Gemfile.lock index 41d2922f63e..a8f7bfe43ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM execjs coffee-script-source (1.10.0) colorize (0.7.7) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) connection_pool (2.2.0) coveralls (0.8.13) json (~> 1.8) @@ -740,7 +740,7 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.1) + sidekiq (4.1.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) |