From 01ae05ffd11edc648e94c44007fced664bc089ea Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 Feb 2021 18:11:05 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/puma.example.development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/puma.example.development.rb') diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 1901b5a0c1c..28c2af3acb3 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -86,7 +86,7 @@ end # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#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 # Use json formatter -- cgit v1.2.3