diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-18 05:10:21 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-07 01:27:50 -0700 |
| commit | ec341a2bbd81eac9639faf5c5e8e8b670f535096 (patch) | |
| tree | 91611d82f2d797684c4099eced90a593de2e5bc8 /app/uploaders | |
| parent | bd73925b858cbb7229b3d335da0e5d0023f57caf (diff) | |
| download | gitlab-ce-ec341a2bbd81eac9639faf5c5e8e8b670f535096.tar.gz | |
Clean up CarrierWave's import/export files
Unlike uploads that have been uploaded with Tempfile, the project
import/export archives are stored in a temporary cache directory and
remain there if:
1. Object storage is enabled
2. `move_to_store` is set to `true`.
CarrierWave will leave these files there until disk space runs out or a
clean step is run manually.
If `move_to_store` is set to `false`, CarrierWave will remove the files
after storing them. However, unlike a local file, with object storage,
the file is still copied, so setting `move_to_store` to `true`
doesn't buy us anything.
To ensure files are cleaned up, we can just inherit from the
GitlabUploader implementation of `move_to_store`, which returns `true`
if it's a local file, `false` otherwise.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60656
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/import_export_uploader.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/uploaders/import_export_uploader.rb b/app/uploaders/import_export_uploader.rb index 716922bc017..104d5d3b3dd 100644 --- a/app/uploaders/import_export_uploader.rb +++ b/app/uploaders/import_export_uploader.rb @@ -7,10 +7,6 @@ class ImportExportUploader < AttachmentUploader EXTENSION_WHITELIST end - def move_to_store - true - end - def move_to_cache false end |