Fix merge conflict resolve

`remove_feature_dependent_sub_relations!` was removed entirely in https://gitlab.com/gitlab-org/gitlab/merge_requests/18024

Fix merge conflict resolve
`remove_feature_dependent_sub_relations!` was removed entirely in https://gitlab.com/gitlab-org/gitlab/merge_requests/18024
48e4ff95 · Aleksei Lipniagov · 70d74166 · 48e4ff95
Commit 48e4ff95 authored Oct 28, 2019 by Aleksei Lipniagov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

lib/gitlab/import_export/project_tree_restorer.rb lib/gitlab/import_export/project_tree_restorer.rb +0 -2

No files found.
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -92,8 +92,6 @@ module Gitlab
      end
      def process_project_relation_item!(relation_key, relation_definition, data_hash)
-        remove_feature_dependent_sub_relations!(data_hash)
        relation_object = build_relation(relation_key, relation_definition, data_hash)
        return unless relation_object
        return if group_model?(relation_object)