diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-18 15:28:46 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-18 15:28:46 +0200 |
| commit | 797504a8d91c06dc197cbadb27b892e8d54f9a66 (patch) | |
| tree | 711dc00336f97a3c4c6da194263e60511e838731 | |
| parent | ee2993040c207f70bf05a730b9389a54928e5a54 (diff) | |
| parent | 2b0d198dac207cd24d34d914d564882f34dd018f (diff) | |
| download | gitlab-ce-797504a8d91c06dc197cbadb27b892e8d54f9a66.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/import_export.yml | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index ae2bf677c90..947f3030f46 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -16,7 +16,6 @@ project_tree: - :merge_request_diff - ci_commits: - :statuses - - :builds - :variables - :triggers - :deploy_keys diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 082398d1f0f..68319441a63 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -3,7 +3,15 @@ module Gitlab module RelationFactory extend self - OVERRIDES = { snippets: :project_snippets, ci_commits: 'Ci::Commit', statuses: 'commit_status' }.freeze + + OVERRIDES = { snippets: :project_snippets, + ci_commits: 'Ci::Commit', + statuses: 'commit_status', + variables: 'Ci::Variable', + triggers: 'Ci::Trigger', + builds: 'Ci::Build', + hooks: 'ProjectHook' }.freeze + USER_REFERENCES = %w(author_id assignee_id updated_by_id).freeze def create(relation_sym:, relation_hash:, members_mapper:, user_admin:) |