Commit 346c493e authored by David Fernandez's avatar David Fernandez

Apply maintainer feedback

parent c56a0fa4
......@@ -165,7 +165,7 @@ RSpec.shared_examples 'process nuget upload' do |user_type, status, add_member =
context 'with object storage disabled' do
before do
allow(Gitlab.config.packages.object_store).to receive(:enabled).and_return(false)
stub_package_file_object_storage(enabled: false)
end
context 'without a file from workhorse' do
......
......@@ -114,11 +114,12 @@ module Gitlab
private
def allow_packages_storage_path?(config)
return unless config.enabled
return unless config['storage_path']
def allow_packages_storage_path?(packages_config)
return unless packages_config.enabled
return unless packages_config['storage_path']
return if packages_config.object_store.enabled && packages_config.object_store.direct_upload
!config.object_store.enabled || !config.object_store.direct_upload
true
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment