diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /config/initializers/1_settings.rb | |
parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index bb0c4696eff..8e4aa5701b4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -364,7 +364,7 @@ Gitlab.ee do # To ensure acceptable performance we only allow feature to be used with # multithreaded web-server Puma. This will be removed once download logic is moved # to GitLab workhorse - Settings.dependency_proxy['enabled'] = false unless Gitlab::Runtime.puma? + Settings.dependency_proxy['enabled'] = false unless defined?(::Puma) end # |