diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-11 14:42:35 +0000 |
|---|---|---|
| committer | Thiago Presa <tpresa@gitlab.com> | 2018-09-11 15:32:09 -0300 |
| commit | 77e6c886329e97cafcc5c7bc046c7795dfb98997 (patch) | |
| tree | 2a34efb7a12aace8562350c36bd427c1975ea048 | |
| parent | 54701ab047cf4e8c6d1a71c9097a47b069724872 (diff) | |
| download | gitlab-ce-77e6c886329e97cafcc5c7bc046c7795dfb98997.tar.gz | |
Merge branch 'fix-namespace-upload' into 'master'
Fix workhorse temp path for namespace uploads
Closes gitlab-ee#7009
See merge request gitlab-org/gitlab-ce!21650
| -rw-r--r-- | app/uploaders/namespace_file_uploader.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-namespace-upload.yml | 5 | ||||
| -rw-r--r-- | spec/uploaders/namespace_file_uploader_spec.rb | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/app/uploaders/namespace_file_uploader.rb b/app/uploaders/namespace_file_uploader.rb index b0154f85a5c..4965bd7f057 100644 --- a/app/uploaders/namespace_file_uploader.rb +++ b/app/uploaders/namespace_file_uploader.rb @@ -21,6 +21,10 @@ class NamespaceFileUploader < FileUploader File.join(model.id.to_s) end + def self.workhorse_local_upload_path + File.join(options.storage_path, 'uploads', TMP_UPLOAD_PATH) + end + # Re-Override def store_dir store_dirs[object_store] diff --git a/changelogs/unreleased/fix-namespace-upload.yml b/changelogs/unreleased/fix-namespace-upload.yml new file mode 100644 index 00000000000..383d79a998f --- /dev/null +++ b/changelogs/unreleased/fix-namespace-upload.yml @@ -0,0 +1,5 @@ +--- +title: Fix workhorse temp path for namespace uploads +merge_request: 21650 +author: +type: fixed diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb index eafbea07e10..799c6db57fa 100644 --- a/spec/uploaders/namespace_file_uploader_spec.rb +++ b/spec/uploaders/namespace_file_uploader_spec.rb @@ -40,6 +40,12 @@ describe NamespaceFileUploader do end end + describe '#workhorse_local_upload_path' do + it 'returns the correct path in uploads directory' do + expect(described_class.workhorse_local_upload_path).to end_with('/uploads/tmp/uploads') + end + end + describe "#migrate!" do before do uploader.store!(fixture_file_upload(File.join('spec/fixtures/doc_sample.txt'))) |