diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-18 08:49:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-18 08:49:36 +0000 |
| commit | 27b732abb159154983424d93d1a68c3d98a65870 (patch) | |
| tree | cd66fe608be9320700f9b819a16ebf4b3c7f048c | |
| parent | 90a6783d0a1338336ffc268d268afbebb25f4293 (diff) | |
| parent | 594d21cdca107460e080b7884bed49e2634cc275 (diff) | |
| download | gitlab-ce-27b732abb159154983424d93d1a68c3d98a65870.tar.gz | |
Merge branch 'rs-update-unicorn' into 'master'
Bump unicorn to `~> 4.9.0`
Closes #2820
See merge request !2843
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 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) |