Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

This commit is contained in:
James Lopez 2016-06-14 16:40:13 +02:00
commit 1d4243f5dd

View file

@ -51,7 +51,7 @@ module Gitlab
end end
def default_relation_list 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] model.is_a?(Hash) && model[:project_members]
end end
end end