Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
346c493e
Commit
346c493e
authored
Mar 10, 2020
by
David Fernandez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply maintainer feedback
parent
c56a0fa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ee/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb
...d_examples/requests/api/nuget_packages_shared_examples.rb
+1
-1
lib/gitlab/middleware/multipart.rb
lib/gitlab/middleware/multipart.rb
+5
-4
No files found.
ee/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb
View file @
346c493e
...
...
@@ -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
...
...
lib/gitlab/middleware/multipart.rb
View file @
346c493e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment