From 2c156e3c7bbade01c36eee18327f1ced6eebea79 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Mar 2020 18:09:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/projects/import_export/export_service.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/services/projects') diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb index 74d5af41a04..f4214410226 100644 --- a/app/services/projects/import_export/export_service.rb +++ b/app/services/projects/import_export/export_service.rb @@ -54,7 +54,16 @@ module Projects end def project_tree_saver - Gitlab::ImportExport::Project::TreeSaver.new(project: project, current_user: current_user, shared: shared, params: params) + tree_saver_class.new(project: project, current_user: current_user, shared: shared, params: params) + end + + def tree_saver_class + if ::Feature.enabled?(:streaming_serializer, project) + Gitlab::ImportExport::Project::TreeSaver + else + # Once we remove :streaming_serializer feature flag, Project::LegacyTreeSaver should be removed as well + Gitlab::ImportExport::Project::LegacyTreeSaver + end end def uploads_saver -- cgit v1.2.3