diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-24 14:05:20 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-24 14:05:20 +0300 |
| commit | f5524d554bce7028f410f51b5fef85641a5f0216 (patch) | |
| tree | a8dd94e02ec482b8acf170f23e69a5e378a6ea6a /lib | |
| parent | 26147b730f0f41650c2b7ff6ab21d645b36273c9 (diff) | |
| parent | 1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (diff) | |
Merge branch '10244-add-project-ci-cd-settings' into 'master'
Introduce new ProjectCiCdSettings model with group_runners_enabled
See merge request gitlab-org/gitlab-ce!18144
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 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index ec91c02dbe7..0d1c4f73c6e 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -64,6 +64,7 @@ project_tree: - :project_feature - :custom_attributes - :project_badges + - :ci_cd_settings # Only include the following attributes for the models specified. included_attributes: @@ -73,6 +74,8 @@ included_attributes: - :username author: - :name + ci_cd_settings: + - :group_runners_enabled # Do not include the following attributes for the models specified. excluded_attributes: diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 598832fb2df..e3e9f156fb4 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -17,7 +17,8 @@ module Gitlab auto_devops: :project_auto_devops, label: :project_label, custom_attributes: 'ProjectCustomAttribute', - project_badges: 'Badge' }.freeze + project_badges: 'Badge', + ci_cd_settings: 'ProjectCiCdSetting' }.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 closed_by_id].freeze |