diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-24 18:12:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-24 18:12:19 +0300 |
| commit | 53ab147992c8e791582f625c80811fdda5ba4d5a (patch) | |
| tree | a36867b0d6c6e0bb8fc8f474082b3a3710433bc3 /lib/gitlab/import_export | |
| parent | 263baf70a1f64bb773bfb57d74516a008c2bc7e4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/group/import_export.yml | 9 | ||||
| -rw-r--r-- | lib/gitlab/import_export/group/relation_factory.rb | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml index 7e81112796f..a58469cea57 100644 --- a/lib/gitlab/import_export/group/import_export.yml +++ b/lib/gitlab/import_export/group/import_export.yml @@ -32,14 +32,11 @@ included_attributes: - :created_at - :updated_at - :start_date - - :last_run_date - - :duration_in_weeks - - :iterations_in_advance - :active - - :automatic - :roll_over - :title - :description + - :sequence iterations_cadences: *iterations_cadence_definition iteration: &iteration_definition - :iid @@ -69,6 +66,10 @@ excluded_attributes: - :state_id iterations_cadence: &iterations_cadence_definition - :id + - :last_run_date + - :duration_in_weeks + - :iterations_in_advance + - :automatic iterations_cadences: *iterations_cadence_definition iteration: &iteration_excluded_definition - :id diff --git a/lib/gitlab/import_export/group/relation_factory.rb b/lib/gitlab/import_export/group/relation_factory.rb index 08db9471e27..1b8436c4ed9 100644 --- a/lib/gitlab/import_export/group/relation_factory.rb +++ b/lib/gitlab/import_export/group/relation_factory.rb @@ -26,7 +26,10 @@ module Gitlab private def setup_models - setup_note if @relation_name == :notes + case @relation_name + when :notes then setup_note + when :'Iterations::Cadence' then setup_iterations_cadence + end update_group_references end @@ -45,6 +48,10 @@ module Gitlab def use_attributes_permitter? false end + + def setup_iterations_cadence + @relation_hash['automatic'] = false + end end end end |