diff options
| author | James Lopez <james@gitlab.com> | 2019-02-16 11:24:28 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-02-16 11:24:28 +0300 |
| commit | 28aa4d331c67fd3206858f57a30a3c14449216f3 (patch) | |
| tree | 1d54b9f5bdbc54b9d92e6c2ce7f57c75d12932b4 /Gemfile.lock | |
| parent | 894ede2631b995f129770b66f81f03f82205c326 (diff) | |
| parent | 7e9ae050d3ff502b0fdea84fc0cbec8b91c4f42c (diff) | |
Merge branch 'sh-bump-unicorn-5.4' into 'master'
Update Unicorn and associated gems
See merge request gitlab-org/gitlab-ce!25265
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 92dd5dac0ca..7caeba15809 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -422,7 +422,7 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake kubeclient (4.2.2) @@ -666,7 +666,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -898,7 +898,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -1169,7 +1169,7 @@ DEPENDENCIES u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) version_sorter (~> 2.1.0) |