Commit 805dc68d authored by Sean McGivern's avatar Sean McGivern

Merge branch 'update-puma-5-5-2' into 'master'

Update Puma to version 5.5.2

See merge request gitlab-org/gitlab!75642
parents 3cd83019 32d23747
...@@ -185,7 +185,7 @@ gem 'rack', '~> 2.2.3' ...@@ -185,7 +185,7 @@ gem 'rack', '~> 2.2.3'
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :puma do group :puma do
gem 'puma', '~> 5.3.1', require: false gem 'puma', '~> 5.5.2', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false gem 'sd_notify', '~> 0.1.0', require: false
end end
......
...@@ -945,7 +945,7 @@ GEM ...@@ -945,7 +945,7 @@ GEM
tty-markdown tty-markdown
tty-prompt tty-prompt
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.3.2) puma (5.5.2)
nio4r (~> 2.0) nio4r (~> 2.0)
puma_worker_killer (0.3.1) puma_worker_killer (0.3.1)
get_process_mem (~> 0.2) get_process_mem (~> 0.2)
...@@ -1581,7 +1581,7 @@ DEPENDENCIES ...@@ -1581,7 +1581,7 @@ DEPENDENCIES
pry-byebug pry-byebug
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-shell (~> 0.5.0) pry-shell (~> 0.5.0)
puma (~> 5.3.1) puma (~> 5.5.2)
puma_worker_killer (~> 0.3.1) puma_worker_killer (~> 0.3.1)
rack (~> 2.2.3) rack (~> 2.2.3)
rack-attack (~> 6.3.0) rack-attack (~> 6.3.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