Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 8 deletions

diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb
index 3fa5765fd4a..9433a231b4a 100644
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -120,10 +120,6 @@ module Gitlab
         end
       end
 
-      def remove_feature_dependent_sub_relations!(_relation_item)
-        # no-op
-      end
-
       def project_relations
         @project_relations ||= reader.attributes_finder.find_relations_tree(:project)
       end
@@ -175,8 +171,6 @@ module Gitlab
 
         # Avoid keeping a possible heavy object in memory once we are done with it
         while relation_item = tree_array.shift
-          remove_feature_dependent_sub_relations!(relation_item)
-
           # The transaction at this level is less speedy than one single transaction
           # But we can't have it in the upper level or GC won't get rid of the AR objects
           # after we save the batch.
@@ -241,5 +235,3 @@ module Gitlab
     end
   end
 end
-
-Gitlab::ImportExport::ProjectTreeRestorer.prepend_if_ee('::EE::Gitlab::ImportExport::ProjectTreeRestorer')