diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-27 09:46:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-27 09:46:21 +0000 |
| commit | 2bfa13f606ac15e7ee7e292239bd5c074ffec0f6 (patch) | |
| tree | 1189008ce284cfb9be6ba8f79e14cf104f040483 /Gemfile.lock | |
| parent | 83624a0ced2e66d1b71103b3ba4f1e4841e6a3d0 (diff) | |
| parent | f7c1d9c47379282fcc4dc16183562630d7d007d0 (diff) | |
| download | gitlab-ce-2bfa13f606ac15e7ee7e292239bd5c074ffec0f6.tar.gz | |
Merge branch 'cs-upgrade-unicorn' into 'master'
Upgrade unicorn and unicorn-worker-killer.
Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. This includes Rack 2.0 support which is necessary for Rails 5.
Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html
Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
See merge request !6463
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 396e692847b..2a2f4d56dbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -553,7 +553,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.17.0) rake (10.5.0) rb-fsevent (0.9.6) rb-inotify (0.9.5) @@ -759,9 +759,8 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.1.1) - unicorn (4.9.0) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) @@ -979,8 +978,8 @@ DEPENDENCIES uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) + unicorn (~> 5.1.0) + unicorn-worker-killer (~> 0.4.4) version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.2) |