diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-11 14:42:35 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-11 14:42:35 +0000 |
| commit | 44931bd23d4e750b1bd690adaaa2fd2b40154117 (patch) | |
| tree | a46f1f2e7d8b47cbb3ab06e70f0532075bedb408 /app | |
| parent | 9b0127e0cf28131aa70d2dfc74ced0602e45671f (diff) | |
| parent | 8440435214257af1b5e9a79e52a0e9b6749b60f2 (diff) | |
| download | gitlab-ce-44931bd23d4e750b1bd690adaaa2fd2b40154117.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
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/namespace_file_uploader.rb | 4 |
1 files changed, 4 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] |