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
998b232c
Commit
998b232c
authored
Feb 21, 2020
by
George Koltsov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ImportExportUploader workhorse_local_upload_path
parent
3a0fc1b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/uploaders/import_export_uploader.rb
app/uploaders/import_export_uploader.rb
+4
-0
changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml
...s/unreleased/georgekoltsov-fix-import-export-uploader.yml
+5
-0
spec/uploaders/import_export_uploader_spec.rb
spec/uploaders/import_export_uploader_spec.rb
+6
-0
No files found.
app/uploaders/import_export_uploader.rb
View file @
998b232c
...
...
@@ -3,6 +3,10 @@
class
ImportExportUploader
<
AttachmentUploader
EXTENSION_WHITELIST
=
%w[tar.gz gz]
.
freeze
def
self
.
workhorse_local_upload_path
File
.
join
(
options
.
storage_path
,
'uploads'
,
TMP_UPLOAD_PATH
)
end
def
extension_whitelist
EXTENSION_WHITELIST
end
...
...
changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml
0 → 100644
View file @
998b232c
---
title
:
Fix Group Import API file upload when object storage is disabled
merge_request
:
25715
author
:
type
:
fixed
spec/uploaders/import_export_uploader_spec.rb
View file @
998b232c
...
...
@@ -51,4 +51,10 @@ describe ImportExportUploader do
end
end
end
describe
'.workhorse_local_upload_path'
do
it
'returns path that includes uploads dir'
do
expect
(
described_class
.
workhorse_local_upload_path
).
to
end_with
(
'/uploads/tmp/uploads'
)
end
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