Add latest changes from gitlab-org/gitlab@master

3 files changed, 77 insertions, 1 deletions

diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml
index 8df5d52bf77..7e81112796f 100644
--- a/lib/gitlab/import_export/group/import_export.yml
+++ b/lib/gitlab/import_export/group/import_export.yml
@@ -27,6 +27,29 @@ included_attributes:
     - :name
   namespace_settings:
     - :prevent_sharing_groups_outside_hierarchy
+  iterations_cadence: &iterations_cadence_definition
+    - :group_id
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :last_run_date
+    - :duration_in_weeks
+    - :iterations_in_advance
+    - :active
+    - :automatic
+    - :roll_over
+    - :title
+    - :description
+  iterations_cadences: *iterations_cadence_definition
+  iteration: &iteration_definition
+    - :iid
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :due_date
+    - :group_id
+    - :description
+  iterations: *iteration_definition
 
 excluded_attributes:
   group:
@@ -44,6 +67,19 @@ excluded_attributes:
     - :max_pages_size
   epics:
     - :state_id
+  iterations_cadence: &iterations_cadence_definition
+    - :id
+  iterations_cadences: *iterations_cadence_definition
+  iteration: &iteration_excluded_definition
+    - :id
+    - :title
+    - :title_html
+    - :project_id
+    - :description_html
+    - :cached_markdown_version
+    - :iterations_cadence_id
+    - :sequence
+  iterations: *iteration_excluded_definition
 
 methods:
   labels:
@@ -92,3 +128,5 @@ ee:
           - milestone:
             - events:
               - :push_event_payload
+      - iterations_cadences:
+        - :iterations
diff --git a/lib/gitlab/import_export/group/legacy_import_export.yml b/lib/gitlab/import_export/group/legacy_import_export.yml
index 082d2346f3d..985e3af1e0c 100644
--- a/lib/gitlab/import_export/group/legacy_import_export.yml
+++ b/lib/gitlab/import_export/group/legacy_import_export.yml
@@ -24,6 +24,29 @@ included_attributes:
     - :username
   author:
     - :name
+  iterations_cadence: &iterations_cadence_definition
+    - :group_id
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :last_run_date
+    - :duration_in_weeks
+    - :iterations_in_advance
+    - :active
+    - :automatic
+    - :roll_over
+    - :title
+    - :description
+  iterations_cadences: *iterations_cadence_definition
+  iteration: &iteration_definition
+    - :iid
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :due_date
+    - :group_id
+    - :description
+  iterations: *iteration_definition
 
 excluded_attributes:
   group:
@@ -41,6 +64,18 @@ excluded_attributes:
     - :extra_shared_runners_minutes_limit
   epics:
     - :state_id
+  iterations_cadence: &iterations_cadence_definition
+    - :id
+  iterations_cadences: *iterations_cadence_definition
+  iteration: &iteration_excluded_definition
+    - :id
+    - :title
+    - :title_html
+    - :project_id
+    - :description_html
+    - :cached_markdown_version
+    - :iterations_cadence_id
+  iterations: *iteration_excluded_definition
 
 methods:
   labels:
@@ -88,3 +123,5 @@ ee:
           - milestone:
             - events:
               - :push_event_payload
+      - iterations_cadences:
+          - :iterations
diff --git a/lib/gitlab/import_export/group/relation_factory.rb b/lib/gitlab/import_export/group/relation_factory.rb
index 258078d595b..e4195e014b3 100644
--- a/lib/gitlab/import_export/group/relation_factory.rb
+++ b/lib/gitlab/import_export/group/relation_factory.rb
@@ -8,7 +8,8 @@ module Gitlab
           labels:     :group_labels,
           priorities: :label_priorities,
           label:      :group_label,
-          parent:     :epic
+          parent:     :epic,
+          iterations_cadences: 'Iterations::Cadence'
         }.freeze
 
         EXISTING_OBJECT_RELATIONS = %i[