diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-11 21:10:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-11 21:10:43 +0300 |
| commit | dcacb5daf7941dd2be05e6f688027baae92a6c81 (patch) | |
| tree | 58e1a4b5be95bbc15f60c7c31a9709668ea1cb18 /Gemfile.lock | |
| parent | ec971a05e380fa580ae75dea30ab963112096525 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 427596e619c..47538b82386 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,7 +152,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.1.3) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -447,11 +447,6 @@ GEM gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pg_query (1.3.1) - gitlab-puma (4.3.5.gitlab.3) - nio4r (~> 2.0) - gitlab-puma_worker_killer (0.1.1.gitlab.1) - get_process_mem (~> 0.2) - gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) gitlab-styles (5.4.0) @@ -876,6 +871,11 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + puma_worker_killer (0.3.1) + get_process_mem (~> 0.2) + puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.5.2) @@ -1301,7 +1301,7 @@ DEPENDENCIES browser (~> 4.2) bullet (~> 6.1.0) bundler-audit (~> 0.6.1) - capybara (~> 3.33.0) + capybara (~> 3.34.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) @@ -1365,8 +1365,6 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-puma (~> 4.3.3.gitlab.2) - gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 5.4.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1460,6 +1458,8 @@ DEPENDENCIES prometheus-client-mmap (~> 0.12.0) pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) + puma (~> 5.1.1) + puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) |