diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 15:07:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 15:07:38 +0000 |
| commit | 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (patch) | |
| tree | 2eff1ce7ac4a58de15b1f5980acfdb22c7b92ac0 /Gemfile.lock | |
| parent | b86f474bf51e20d2db4cf0895d0a8e0894e31c08 (diff) | |
| download | gitlab-ce-4eea104c69e59f6fa53c7bc15b986c69f29b60c8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cba3d118a7e..6bc85ac8668 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,9 +118,9 @@ GEM brakeman (4.2.1) browser (2.5.3) builder (3.2.3) - bullet (5.5.1) + bullet (6.0.2) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.11) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) @@ -372,6 +372,11 @@ GEM gitlab-license (1.0.0) gitlab-markup (1.7.0) gitlab-net-dns (0.9.1) + gitlab-puma (4.3.1.gitlab.2) + 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 (2.8.0) @@ -619,7 +624,7 @@ GEM net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) - nio4r (2.3.1) + nio4r (2.5.2) no_proxy_fix (0.1.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) @@ -748,11 +753,6 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.1.1) - puma (4.3.1) - nio4r (~> 2.0) - puma_worker_killer (0.1.1) - get_process_mem (~> 0.2) - puma (>= 2.7, < 5) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) rack (2.0.7) @@ -1057,7 +1057,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.10.0) + uniform_notifier (1.13.0) unleash (0.1.5) murmurhash3 (~> 0.1.6) unparser (0.4.5) @@ -1139,7 +1139,7 @@ DEPENDENCIES bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) - bullet (~> 5.5.0) + bullet (~> 6.0.2) bundler-audit (~> 0.5.0) capybara (~> 3.22.0) capybara-screenshot (~> 1.0.22) @@ -1200,6 +1200,8 @@ DEPENDENCIES gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) + gitlab-puma (~> 4.3.1.gitlab.2) + gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) gitlab_chronic_duration (~> 0.10.6.2) @@ -1280,8 +1282,6 @@ DEPENDENCIES prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) - puma (~> 4.3.0) - puma_worker_killer (~> 0.1.1) rack (~> 2.0.7) rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) |