Commit 1c9a8c8c authored by Stan Hu's avatar Stan Hu

Merge branch 'georgekoltsov/fix-import-export-uploader' into 'master'

Update ImportExportUploader workhorse_local_upload_path

See merge request gitlab-org/gitlab!25715
parents bc9dd91f 998b232c
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
class ImportExportUploader < AttachmentUploader class ImportExportUploader < AttachmentUploader
EXTENSION_WHITELIST = %w[tar.gz gz].freeze 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 def extension_whitelist
EXTENSION_WHITELIST EXTENSION_WHITELIST
end end
......
---
title: Fix Group Import API file upload when object storage is disabled
merge_request: 25715
author:
type: fixed
...@@ -51,4 +51,10 @@ describe ImportExportUploader do ...@@ -51,4 +51,10 @@ describe ImportExportUploader do
end end
end 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 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