Commit d74011c8 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'sh-upgrade-unicorn' into 'master'

Upgrade Unicorn to v5.5.1

Closes #213257

See merge request gitlab-org/gitlab!30541
parents 8b279be5 5e5efcd0
......@@ -166,7 +166,7 @@ gem 'diff_match_patch', '~> 0.1.0'
gem 'rack', '~> 2.0.9'
group :unicorn do
gem 'unicorn', '~> 5.4.1'
gem 'unicorn', '~> 5.5'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
......
......@@ -589,7 +589,7 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.11.2)
kgio (2.11.3)
knapsack (1.17.0)
rake
kramdown (2.1.0)
......@@ -1108,7 +1108,7 @@ GEM
unicode_plot (0.0.4)
enumerable-statistics (>= 2.0.1)
unicode_utils (1.4.0)
unicorn (5.4.1)
unicorn (5.5.5)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
......@@ -1410,7 +1410,7 @@ DEPENDENCIES
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
unicorn (~> 5.4.1)
unicorn (~> 5.5)
unicorn-worker-killer (~> 0.4.4)
unleash (~> 0.1.5)
validates_hostname (~> 1.0.6)
......
---
title: Upgrade Unicorn to v5.5.1
merge_request: 30541
author:
type: fixed
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