diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-04 22:12:18 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-06 09:51:28 -0700 |
| commit | 8a417f5ae89a509a006bac8a2d6104d8b169782c (patch) | |
| tree | 3bc284f60f3cb7bccad319891a38f947c62c4812 /app/uploaders/lfs_object_uploader.rb | |
| parent | 6ac1caa01a4c059f5bcb7c9da2e83001e5469f73 (diff) | |
| download | gitlab-ce-8a417f5ae89a509a006bac8a2d6104d8b169782c.tar.gz | |
Set artifact working directory to be in the destination store to prevent unnecessary I/Osh-fix-refactor-uploader-work-dir
Similar to #33218, build artifacts were being uploaded into a CarrierWave
temporary directory in the Rails root directory before moved to their
final destination, which could cause a copy across filesystems. This
merge request refactors the work in !11866 so that any uploader can
just override `work_dir` to change the default implementation.
Closes #33274
Diffstat (limited to 'app/uploaders/lfs_object_uploader.rb')
| -rw-r--r-- | app/uploaders/lfs_object_uploader.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/uploaders/lfs_object_uploader.rb b/app/uploaders/lfs_object_uploader.rb index 02589959c2f..d11ebf0f9ca 100644 --- a/app/uploaders/lfs_object_uploader.rb +++ b/app/uploaders/lfs_object_uploader.rb @@ -16,16 +16,4 @@ class LfsObjectUploader < GitlabUploader def work_dir File.join(Gitlab.config.lfs.storage_path, 'tmp', 'work') end - - private - - # To prevent LFS files from moving across filesystems, override the default - # implementation: - # http://github.com/carrierwaveuploader/carrierwave/blob/v1.0.0/lib/carrierwave/uploader/cache.rb#L181-L183 - def workfile_path(for_file = original_filename) - # To be safe, keep this directory outside of the the cache directory - # because calling CarrierWave.clean_cache_files! will remove any files in - # the cache directory. - File.join(work_dir, @cache_id, version_name.to_s, for_file) - end end |