diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 21:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 21:09:44 +0300 |
commit | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (patch) | |
tree | 115fa8dbf6bc05037378b380311d31acb805f54c /app/services/projects/import_export | |
parent | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/projects/import_export')
-rw-r--r-- | app/services/projects/import_export/export_service.rb | 11 |
1 files changed, 10 insertions, 1 deletions
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 |