diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 09:10:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 09:10:29 +0300 |
| commit | b7eed2ea49477a8baa7d9b0cf8034c799cde2e0f (patch) | |
| tree | 38df0de2d4c7344a07d55f7cf5914344ba88e8e6 /lib/gitlab/runtime.rb | |
| parent | 11bfe6f3835256acf60ef98f9e2a37f417418681 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/runtime.rb')
| -rw-r--r-- | lib/gitlab/runtime.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb index ee9e6da6146..b0bcea0ca69 100644 --- a/lib/gitlab/runtime.rb +++ b/lib/gitlab/runtime.rb @@ -87,7 +87,7 @@ module Gitlab def max_threads threads = 1 # main thread - if puma? + if puma? && Puma.respond_to?(:cli_config) threads += Puma.cli_config.options[:max_threads] elsif sidekiq? # An extra thread for the poller in Sidekiq Cron: |