diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
| commit | 390582e118752426acf5cb25ec99103d312d891c (patch) | |
| tree | bb0b1a6a46632024ffc3ba1983e4ebcb0fab4428 /lib/gitlab/git | |
| parent | 1ea1db491c8bc90789acda45c9002aaa5c4dc498 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/rugged_impl/use_rugged.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/git/rugged_impl/use_rugged.rb b/lib/gitlab/git/rugged_impl/use_rugged.rb index 068aaf03c51..f63e35030c1 100644 --- a/lib/gitlab/git/rugged_impl/use_rugged.rb +++ b/lib/gitlab/git/rugged_impl/use_rugged.rb @@ -16,7 +16,9 @@ module Gitlab end def running_puma_with_multiple_threads? - Gitlab::Runtime.puma? && ::Puma.cli_config.options[:max_threads] > 1 + return false unless Gitlab::Runtime.puma? + + ::Puma.respond_to?(:cli_config) && ::Puma.cli_config.options[:max_threads] > 1 end def execute_rugged_call(method_name, *args) |