From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Jul 2020 12:26:25 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee

---
 lib/gitlab/import_export/project/import_export.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lib/gitlab/import_export/project/import_export.yml')

diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index f0b733d7e95..aa961bd8d19 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -89,7 +89,6 @@ tree:
     - :triggers
     - :pipeline_schedules
     - :container_expiration_policy
-    - :services
     - protected_branches:
       - :merge_access_levels
       - :push_access_levels
@@ -169,6 +168,7 @@ excluded_attributes:
     - :marked_for_deletion_by_user_id
     - :compliance_framework_setting
     - :show_default_award_emojis
+    - :services
   namespaces:
     - :runners_token
     - :runners_token_encrypted
@@ -261,10 +261,6 @@ excluded_attributes:
   runners:
     - :token
     - :token_encrypted
-  services:
-    - :inherit_from_id
-    - :instance
-    - :template
   error_tracking_setting:
     - :encrypted_token
     - :encrypted_token_iv
@@ -313,12 +309,14 @@ excluded_attributes:
     - :merge_request_id
     - :external_pull_request_id
     - :ci_ref_id
+    - :locked
   stages:
     - :pipeline_id
   merge_access_levels:
     - :protected_branch_id
   push_access_levels:
     - :protected_branch_id
+    - :deploy_key_id
   unprotect_access_levels:
     - :protected_branch_id
   create_access_levels:
@@ -353,8 +351,6 @@ methods:
     - :type
   statuses:
     - :type
-  services:
-    - :type
   merge_request_diff_files:
     - :utf8_diff
   merge_requests:
-- 
cgit v1.2.3