diff --git a/files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb index 541f98caa55d2fd3a83f8d3861bd4369d0fd43ed_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvcHVtYS5yYi5lcmI=..dbde246b6b68d7a7703af37d29995a06b0425e63_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvcHVtYS5yYi5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb @@ -112,13 +112,6 @@ # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f -# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258 -# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork -if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 && - ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true' - nakayoshi_fork -end - # Use customised JSON formatter for Puma log require_relative "<%= @install_dir %>/embedded/service/gitlab-rails/lib/gitlab/puma_logging/json_formatter"