Merge branch 'georgekoltsov/fix-import-export-uploader' into 'master'

Update ImportExportUploader workhorse_local_upload_path

See merge request gitlab-org/gitlab!25715

app/uploaders/import_export_uploader.rb

@@ -3,6 +3,10 @@
 class ImportExportUploader < AttachmentUploader
   EXTENSION_WHITELIST = %w[tar.gz gz].freeze
 
+  def self.workhorse_local_upload_path
+    File.join(options.storage_path, 'uploads', TMP_UPLOAD_PATH)
+  end
+
   def extension_whitelist
     EXTENSION_WHITELIST
   end

changelogs/unreleased/georgekoltsov-fix-import-export-uploader.yml

+---
+title: Fix Group Import API file upload when object storage is disabled
+merge_request: 25715
+author:
+type: fixed

spec/uploaders/import_export_uploader_spec.rb

@@ -51,4 +51,10 @@ describe ImportExportUploader do
       end
     end
   end
+
+  describe '.workhorse_local_upload_path' do
+    it 'returns path that includes uploads dir' do
+      expect(described_class.workhorse_local_upload_path).to end_with('/uploads/tmp/uploads')
+    end
+  end
 end