Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 139 insertions, 1 deletions

diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 8046fedc4f3..86fd11cc336 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -131,7 +131,6 @@ included_attributes:
     - :link_url
     - :name
     - :project_id
-    - :type
     - :updated_at
   pipeline_schedules:
     - :active
@@ -155,6 +154,124 @@ included_attributes:
     - :enabled
     - :project_id
     - :updated_at
+  boards:
+    - :project_id
+    - :created_at
+    - :updated_at
+    - :group_id
+    - :weight
+    - :name
+    - :hide_backlog_list
+    - :hide_closed_list
+  lists:
+    - :list_type
+    - :position
+    - :created_at
+    - :updated_at
+    - :user_id
+    - :max_issue_count
+    - :max_issue_weight
+    - :limit_metric
+  custom_attributes:
+    - :created_at
+    - :updated_at
+    - :project_id
+    - :key
+    - :value
+  label:
+    - :title
+    - :color
+    - :project_id
+    - :group_id
+    - :created_at
+    - :updated_at
+    - :template
+    - :description
+    - :priority
+  labels:
+    - :title
+    - :color
+    - :project_id
+    - :group_id
+    - :created_at
+    - :updated_at
+    - :template
+    - :description
+    - :priority
+  priorities:
+    - :project_id
+    - :priority
+    - :created_at
+    - :updated_at
+  milestone:
+    - :iid
+    - :title
+    - :project_id
+    - :group_id
+    - :description
+    - :due_date
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :state
+  milestones:
+    - :iid
+    - :title
+    - :project_id
+    - :group_id
+    - :description
+    - :due_date
+    - :created_at
+    - :updated_at
+    - :start_date
+    - :state
+  protected_branches:
+    - :project_id
+    - :name
+    - :created_at
+    - :updated_at
+    - :code_owner_approval_required
+    - :allow_force_push
+  protected_tags:
+    - :project_id
+    - :name
+    - :created_at
+    - :updated_at
+  create_access_levels:
+    - :access_level
+    - :created_at
+    - :updated_at
+    - :user_id
+    - :group_id
+  merge_access_levels:
+    - :access_level
+    - :created_at
+    - :updated_at
+    - :user_id
+    - :group_id
+  push_access_levels:
+    - :access_level
+    - :created_at
+    - :updated_at
+    - :user_id
+    - :group_id
+  releases:
+    - :tag
+    - :description
+    - :project_id
+    - :author_id
+    - :created_at
+    - :updated_at
+    - :name
+    - :sha
+    - :released_at
+  links:
+    - :url
+    - :name
+    - :created_at
+    - :updated_at
+    - :filepath
+    - :link_type
 
 # Do not include the following attributes for the models specified.
 excluded_attributes:
@@ -498,6 +615,10 @@ ee:
         - :deploy_access_levels
       - :security_setting
       - :push_rule
+      - boards:
+        - :milestone
+        - lists:
+          - :milestone
 
   included_attributes:
     issuable_sla:
@@ -519,3 +640,20 @@ ee:
       - :reject_unsigned_commits
       - :commit_committer_check
       - :regexp_uses_re2
+    unprotect_access_levels:
+      - :access_level
+      - :user_id
+      - :group_id
+    deploy_access_levels:
+      - :created_at
+      - :updated_at
+      - :access_level
+      - :user_id
+      - :group_id
+    protected_environments:
+      - :project_id
+      - :group_id
+      - :name
+      - :created_at
+      - :updated_at
+