diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-14 16:37:41 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-14 16:37:41 +0200 |
| commit | 862b359b9a3f271b23f393932fb0e85d65c56c6b (patch) | |
| tree | 6d85e2a64c092f476800657e9eca84c60578d151 /lib | |
| parent | 279412f90a58b2bfa939e82c2f90aa0cac2c715b (diff) | |
| download | gitlab-ce-862b359b9a3f271b23f393932fb0e85d65c56c6b.tar.gz | |
fix merge issue
Diffstat (limited to 'lib')
| -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 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 |