Merge branches 'feature/project-export-ui-experimental' and...

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

lib/gitlab/import_export/import_export.yml

@@ -16,7 +16,6 @@ project_tree:
     - :merge_request_diff
   - ci_commits:
     - :statuses
-  - :builds
   - :variables
   - :triggers
   - :deploy_keys

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:)