diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /config/puma_actioncable.example.development.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'config/puma_actioncable.example.development.rb')
-rw-r--r-- | config/puma_actioncable.example.development.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb index a12b4523848..d0da3dcd8f2 100644 --- a/config/puma_actioncable.example.development.rb +++ b/config/puma_actioncable.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 |