diff options
author | James Lopez <james@jameslopez.es> | 2016-07-14 13:07:54 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-07-14 13:07:54 +0300 |
commit | 097706b4588ca8ace9dfaab44f03d62ac6b3a2be (patch) | |
tree | 6aba202f9e91735d9cfab07a795779d47ce122a4 /lib/gitlab | |
parent | 7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff) |
fix EE => CE project import, and updated JSON spec
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 9824df3f274..6ba25a31641 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -87,7 +87,7 @@ module Gitlab project_id = @relation_hash.delete('project_id') # project_id may not be part of the export, but we always need to populate it if required. - @relation_hash['project_id'] = project_id if relation_class.column_names.include?('project_id') + @relation_hash['project_id'] = project_id @relation_hash['gl_project_id'] = project_id if @relation_hash['gl_project_id'] @relation_hash['target_project_id'] = project_id if @relation_hash['target_project_id'] @relation_hash['source_project_id'] = -1 if @relation_hash['source_project_id'] @@ -111,7 +111,7 @@ module Gitlab end def imported_object - imported_object = relation_class.new(@relation_hash) + imported_object = relation_class.new(parsed_relation_hash) yield(imported_object) if block_given? imported_object.importing = true if imported_object.respond_to?(:importing) imported_object @@ -125,6 +125,10 @@ module Gitlab def admin_user? @user.is_admin? end + + def parsed_relation_hash + @relation_hash.reject { |k, _v| !relation_class.attribute_method?(k) } + end end end end |