diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 06:06:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 06:06:25 +0000 |
| commit | 45a05a8ba33101ffcd154ee84307885b48b17962 (patch) | |
| tree | 037cf2ef8575f6f4900f6ec009ca2ac46a539192 /Gemfile.lock | |
| parent | 284ae7dd7536df63fc6dd971f65ca420e26d2f05 (diff) | |
| download | gitlab-ce-45a05a8ba33101ffcd154ee84307885b48b17962.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ba40ebc6cb5..0f9b78cd8e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -749,10 +749,11 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.1.1) - puma (3.12.0) - puma_worker_killer (0.1.0) + puma (4.3.0) + nio4r (~> 2.0) + puma_worker_killer (0.1.1) get_process_mem (~> 0.2) - puma (>= 2.7, < 4) + puma (>= 2.7, < 5) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) rack (2.0.7) @@ -1280,8 +1281,8 @@ DEPENDENCIES prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) - puma (~> 3.12) - puma_worker_killer + puma (~> 4.3.0) + puma_worker_killer (~> 0.1.1) rack (~> 2.0.7) rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) |