diff options
author | James Lopez <james@jameslopez.es> | 2016-06-14 16:40:13 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-14 16:40:13 +0200 |
commit | 1d4243f5dd219d6e139864456353bee5f325bd72 (patch) | |
tree | 48c85265021e7feb10459326a4ad6905e342895f | |
parent | 9ecebaaea16d206ed20a2f4fc0021a2145c873f5 (diff) | |
parent | 862b359b9a3f271b23f393932fb0e85d65c56c6b (diff) | |
download | gitlab-ce-1d4243f5dd219d6e139864456353bee5f325bd72.tar.gz |
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
-rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 290b38927ae..92727528d01 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -51,7 +51,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 |