summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-02-16 18:14:47 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-02-16 18:15:06 -0500
commit594d21cdca107460e080b7884bed49e2634cc275 (patch)
treec419e50a614a73be130d6e0f42f3d2b12bd757cf
parent4c3fe9e10422a73fb77c3c3f51351b69d545c5f7 (diff)
downloadgitlab-ce-rs-update-unicorn.tar.gz
Bump unicorn to `~> 4.9.0`rs-update-unicorn
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index a1c57af4bac..6dcc9b0dd80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3'
# Application server
group :unicorn do
- gem "unicorn", '~> 4.8.2'
+ gem "unicorn", '~> 4.9.0'
gem 'unicorn-worker-killer', '~> 0.4.2'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 718285e1665..1ca4b7b96b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -833,7 +833,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
- unicorn (4.8.3)
+ unicorn (4.9.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -1034,7 +1034,7 @@ DEPENDENCIES
uglifier (~> 2.7.2)
underscore-rails (~> 1.8.0)
unf (~> 0.1.4)
- unicorn (~> 4.8.2)
+ unicorn (~> 4.9.0)
unicorn-worker-killer (~> 0.4.2)
version_sorter (~> 2.0.0)
virtus (~> 1.0.1)