From 44fdf983bd35328dd577d3d3650d14163ef3e2b6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 15 Apr 2020 15:42:17 +0000
Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee

---
 .../import_export/group/legacy_tree_saver.rb       | 57 ++++++++++++++++++++++
 lib/gitlab/import_export/group/tree_saver.rb       | 57 ----------------------
 2 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 lib/gitlab/import_export/group/legacy_tree_saver.rb
 delete mode 100644 lib/gitlab/import_export/group/tree_saver.rb

(limited to 'lib/gitlab/import_export/group')

diff --git a/lib/gitlab/import_export/group/legacy_tree_saver.rb b/lib/gitlab/import_export/group/legacy_tree_saver.rb
new file mode 100644
index 00000000000..3776ef0d8f5
--- /dev/null
+++ b/lib/gitlab/import_export/group/legacy_tree_saver.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Group
+      class LegacyTreeSaver
+        attr_reader :full_path, :shared
+
+        def initialize(group:, current_user:, shared:, params: {})
+          @params       = params
+          @current_user = current_user
+          @shared       = shared
+          @group        = group
+          @full_path    = File.join(@shared.export_path, ImportExport.group_filename)
+        end
+
+        def save
+          group_tree = serialize(@group, reader.group_tree)
+          tree_saver.save(group_tree, @shared.export_path, ImportExport.group_filename)
+
+          true
+        rescue => e
+          @shared.error(e)
+          false
+        end
+
+        private
+
+        def serialize(group, relations_tree)
+          group_tree = tree_saver.serialize(group, relations_tree)
+
+          group.children.each do |child|
+            group_tree['children'] ||= []
+            group_tree['children'] << serialize(child, relations_tree)
+          end
+
+          group_tree
+        rescue => e
+          @shared.error(e)
+        end
+
+        def reader
+          @reader ||= Gitlab::ImportExport::Reader.new(
+            shared: @shared,
+            config: Gitlab::ImportExport::Config.new(
+              config: Gitlab::ImportExport.group_config_file
+            ).to_h
+          )
+        end
+
+        def tree_saver
+          @tree_saver ||= LegacyRelationTreeSaver.new
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/group/tree_saver.rb b/lib/gitlab/import_export/group/tree_saver.rb
deleted file mode 100644
index fd1eb329ad2..00000000000
--- a/lib/gitlab/import_export/group/tree_saver.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module ImportExport
-    module Group
-      class TreeSaver
-        attr_reader :full_path, :shared
-
-        def initialize(group:, current_user:, shared:, params: {})
-          @params       = params
-          @current_user = current_user
-          @shared       = shared
-          @group        = group
-          @full_path    = File.join(@shared.export_path, ImportExport.group_filename)
-        end
-
-        def save
-          group_tree = serialize(@group, reader.group_tree)
-          tree_saver.save(group_tree, @shared.export_path, ImportExport.group_filename)
-
-          true
-        rescue => e
-          @shared.error(e)
-          false
-        end
-
-        private
-
-        def serialize(group, relations_tree)
-          group_tree = tree_saver.serialize(group, relations_tree)
-
-          group.children.each do |child|
-            group_tree['children'] ||= []
-            group_tree['children'] << serialize(child, relations_tree)
-          end
-
-          group_tree
-        rescue => e
-          @shared.error(e)
-        end
-
-        def reader
-          @reader ||= Gitlab::ImportExport::Reader.new(
-            shared: @shared,
-            config: Gitlab::ImportExport::Config.new(
-              config: Gitlab::ImportExport.group_config_file
-            ).to_h
-          )
-        end
-
-        def tree_saver
-          @tree_saver ||= LegacyRelationTreeSaver.new
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3