From fdc98c3e3cfdca66222044fc6aa195011d227ee2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 24 Jan 2022 18:14:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/uploaders/import_export_uploader.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/uploaders/import_export_uploader.rb') 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 -- cgit v1.2.3