Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

spec/features/projects/import_export/export_file_spec.rb

@@ -15,7 +15,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
   let(:sensitive_words) { %w[pass secret token key] }
   let(:safe_list) do
     {
-      token: [ProjectHook, Ci::Trigger],
+      token: [ProjectHook, Ci::Trigger, CommitStatus],
       key: [Project, Ci::Variable, :yaml_variables]
     }
   end

spec/lib/gitlab/import_export/all_models.yml

@@ -13,6 +13,8 @@ issues:
 - user_agent_detail
 - moved_to
 - events
+- merge_requests_closing_issues
+- metrics
 events:
 - author
 - project
@@ -71,6 +73,8 @@ merge_requests:
 - merge_request_diffs
 - merge_request_diff
 - events
+- merge_requests_closing_issues
+- metrics
 merge_request_diff:
 - merge_request
 pipelines:
@@ -101,6 +105,10 @@ protected_branches:
 - project
 - merge_access_levels
 - push_access_levels
+merge_access_levels:
+- protected_branch
+push_access_levels:
+- protected_branch
 project:
 - taggings
 - base_tags

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -214,6 +214,7 @@ CommitStatus:
 - when
 - yaml_variables
 - queued_at
+- token
 Ci::Variable:
 - id
 - project_id
@@ -307,4 +308,16 @@ ProjectFeature:
 - snippets_access_level
 - builds_access_level
 - created_at
-- updated_at
\ No newline at end of file
+- updated_at
+ProtectedBranch::MergeAccessLevel:
+- id
+- protected_branch_id
+- access_level
+- created_at
+- updated_at
+ProtectedBranch::PushAccessLevel:
+- id
+- protected_branch_id
+- access_level
+- created_at
+- updated_at