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 | |
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')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -120,8 +120,8 @@ gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem 'unicorn', '~> 4.9.0' - gem 'unicorn-worker-killer', '~> 0.4.2' + gem 'unicorn', '~> 5.1.0' + gem 'unicorn-worker-killer', '~> 0.4.4' end # State machine |