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 /lib/gitlab/runtime.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'lib/gitlab/runtime.rb')
-rw-r--r-- | lib/gitlab/runtime.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb index 647ac169f05..968ef06b085 100644 --- a/lib/gitlab/runtime.rb +++ b/lib/gitlab/runtime.rb @@ -82,7 +82,10 @@ module Gitlab end def puma_in_clustered_mode? - puma? && Puma.cli_config.options[:workers].to_i > 0 + return unless puma? + return unless Puma.respond_to?(:cli_config) + + Puma.cli_config.options[:workers].to_i > 0 end def max_threads |