diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-07 17:28:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-07 17:28:30 +0000 |
| commit | f88659d005b1ad4d07755e0f296c22d424d3e1bd (patch) | |
| tree | 09e8b4ff0d9cc90faa99a25f7fb622c50a6dced8 /lib | |
| parent | 45510326d0ebec81539b855ec7789c8bb092eb67 (diff) | |
| parent | 12ddc28f844fe63446a16ac908b09ed7b13c71ef (diff) | |
| download | gitlab-ce-f88659d005b1ad4d07755e0f296c22d424d3e1bd.tar.gz | |
Merge branch 'zj-auto-devops-table' into 'master'
Implement the implied CI/CD config for AutoDevOps
Closes #34777
See merge request !13923
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 3 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index ec73846d844..2171c6c7bbb 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -50,6 +50,7 @@ project_tree: - :push_event_payload - :stages - :statuses + - :auto_devops - :triggers - :pipeline_schedules - :services @@ -142,4 +143,4 @@ methods: events: - :action push_event_payload: - - :action
\ No newline at end of file + - :action diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index d563a87dcfd..380b336395d 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -14,6 +14,7 @@ module Gitlab create_access_levels: 'ProtectedTag::CreateAccessLevel', labels: :project_labels, priorities: :label_priorities, + auto_devops: :project_auto_devops, label: :project_label }.freeze USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id].freeze |