From 862b359b9a3f271b23f393932fb0e85d65c56c6b Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 14 Jun 2016 16:37:41 +0200 Subject: [PATCH] fix merge issue --- lib/gitlab/import_export/project_tree_restorer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index c7c1c376ab7..75a261bb121 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -52,7 +52,7 @@ module Gitlab end def default_relation_list - Gitlab::ImportExport::ImportExportReader.new(shared: @shared).tree.reject do |model| + Gitlab::ImportExport::Reader.new(shared: @shared).tree.reject do |model| model.is_a?(Hash) && model[:project_members] end end