Commit 79013116 authored by Stan Hu's avatar Stan Hu

Merge branch 'nakayoshi-default-enabled' into 'master'

Enable `nakayoshi_fork` by default

See merge request gitlab-org/gitlab!54688
parents 615be423 52c2838c
---
title: Enable `nakayoshi_fork` by default
merge_request: 54688
author:
type: other
...@@ -86,7 +86,7 @@ end ...@@ -86,7 +86,7 @@ end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
if defined?(nakayoshi_fork) if defined?(nakayoshi_fork)
nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
end end
# Use json formatter # Use json formatter
......
...@@ -76,7 +76,7 @@ end ...@@ -76,7 +76,7 @@ end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
if defined?(nakayoshi_fork) if defined?(nakayoshi_fork)
nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
end end
# Use json formatter # Use json formatter
......
...@@ -86,7 +86,7 @@ end ...@@ -86,7 +86,7 @@ end
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
if defined?(nakayoshi_fork) if defined?(nakayoshi_fork)
nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
end end
# Use json formatter # Use json formatter
......
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