Commit ff7f6c1f authored by Stan Hu's avatar Stan Hu

Merge branch 'update-puma-to-4' into 'master'

Update Puma to v4.3.0

Closes #36966

See merge request gitlab-org/gitlab!20560
parents 1d33ddd2 b59416d8
...@@ -170,8 +170,8 @@ group :unicorn do ...@@ -170,8 +170,8 @@ group :unicorn do
end end
group :puma do group :puma do
gem 'puma', '~> 3.12', require: false gem 'puma', '~> 4.3.0', require: false
gem 'puma_worker_killer', require: false gem 'puma_worker_killer', '~> 0.1.1', require: false
gem 'rack-timeout', require: false gem 'rack-timeout', require: false
end end
......
...@@ -749,10 +749,11 @@ GEM ...@@ -749,10 +749,11 @@ GEM
pry-rails (0.3.6) pry-rails (0.3.6)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (3.1.1) public_suffix (3.1.1)
puma (3.12.0) puma (4.3.0)
puma_worker_killer (0.1.0) nio4r (~> 2.0)
puma_worker_killer (0.1.1)
get_process_mem (~> 0.2) get_process_mem (~> 0.2)
puma (>= 2.7, < 4) puma (>= 2.7, < 5)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6) raabro (1.1.6)
rack (2.0.7) rack (2.0.7)
...@@ -1280,8 +1281,8 @@ DEPENDENCIES ...@@ -1280,8 +1281,8 @@ DEPENDENCIES
prometheus-client-mmap (~> 0.9.10) prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1) pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
puma (~> 3.12) puma (~> 4.3.0)
puma_worker_killer puma_worker_killer (~> 0.1.1)
rack (~> 2.0.7) rack (~> 2.0.7)
rack-attack (~> 6.2.0) rack-attack (~> 6.2.0)
rack-cors (~> 1.0.0) rack-cors (~> 1.0.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment