summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-18 08:49:36 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-18 08:49:36 +0000
commit27b732abb159154983424d93d1a68c3d98a65870 (patch)
treecd66fe608be9320700f9b819a16ebf4b3c7f048c /Gemfile.lock
parent90a6783d0a1338336ffc268d268afbebb25f4293 (diff)
parent594d21cdca107460e080b7884bed49e2634cc275 (diff)
downloadgitlab-ce-27b732abb159154983424d93d1a68c3d98a65870.tar.gz
Merge branch 'rs-update-unicorn' into 'master'
Bump unicorn to `~> 4.9.0` Closes #2820 See merge request !2843
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d84cc2d0789..cebd79843b1 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)