diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-24 21:14:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-24 21:14:42 +0300 |
| commit | fdc98c3e3cfdca66222044fc6aa195011d227ee2 (patch) | |
| tree | 28ad3af7ed332c76b4f05e8fd456eaed4bac9c49 /app/uploaders/import_export_uploader.rb | |
| parent | 87543246d9d68066b216811f3de590689e218e7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders/import_export_uploader.rb')
| -rw-r--r-- | app/uploaders/import_export_uploader.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/import_export_uploader.rb b/app/uploaders/import_export_uploader.rb index 7b161d72efb..1dcd336d5d9 100644 --- a/app/uploaders/import_export_uploader.rb +++ b/app/uploaders/import_export_uploader.rb @@ -12,6 +12,10 @@ class ImportExportUploader < AttachmentUploader end def move_to_cache + # Exports create temporary files that we can safely move. + # Imports may be from project templates that we want to copy. + return super if mounted_as == :export_file + false end |