Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 13 deletions

diff --git a/app/services/groups/import_export/export_service.rb b/app/services/groups/import_export/export_service.rb
index bd54b48c5f4..2d88283661c 100644
--- a/app/services/groups/import_export/export_service.rb
+++ b/app/services/groups/import_export/export_service.rb
@@ -71,7 +71,7 @@ module Groups
       end
 
       def tree_exporter
-        tree_exporter_class.new(
+        Gitlab::ImportExport::Group::TreeSaver.new(
           group: group,
           current_user: current_user,
           shared: shared,
@@ -79,18 +79,6 @@ module Groups
         )
       end
 
-      def tree_exporter_class
-        if ndjson?
-          Gitlab::ImportExport::Group::TreeSaver
-        else
-          Gitlab::ImportExport::Group::LegacyTreeSaver
-        end
-      end
-
-      def ndjson?
-        ::Feature.enabled?(:group_export_ndjson, group&.parent)
-      end
-
       def version_saver
         Gitlab::ImportExport::VersionSaver.new(shared: shared)
       end