Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

4 files changed, 16 insertions, 4 deletions

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index b474f5825fd..7ed80cbcf66 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -61,6 +61,7 @@ issues:
 - pending_escalations
 - customer_relations_contacts
 - issue_customer_relations_contacts
+- email
 work_item_type:
 - issues
 events:
@@ -197,6 +198,7 @@ merge_requests:
 - system_note_metadata
 - note_authors
 - cleanup_schedule
+- compliance_violations
 external_pull_requests:
 - project
 merge_request_diff:
@@ -223,6 +225,7 @@ ci_pipelines:
 - ci_ref
 - stages
 - statuses
+- statuses_order_id_desc
 - latest_statuses_ordered_by_stage
 - builds
 - bridges
@@ -596,6 +599,8 @@ project:
 - security_scans
 - ci_feature_usages
 - bulk_import_exports
+- ci_project_mirror
+- sync_events
 award_emoji:
 - awardable
 - user
diff --git a/spec/lib/gitlab/import_export/attributes_permitter_spec.rb b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb
index 8ae387d95e3..c748f966463 100644
--- a/spec/lib/gitlab/import_export/attributes_permitter_spec.rb
+++ b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb
@@ -140,6 +140,7 @@ RSpec.describe Gitlab::ImportExport::AttributesPermitter do
       :zoom_meetings               | true
       :issues                      | true
       :group_members               | true
+      :project                     | true
     end
 
     with_them do
@@ -150,7 +151,11 @@ RSpec.describe Gitlab::ImportExport::AttributesPermitter do
   describe 'included_attributes for Project' do
     subject { described_class.new }
 
-    additional_attributes = { user: %w[id] }
+    # these are attributes for which either a special exception is made or are available only via included modules and not attribute introspection
+    additional_attributes = {
+      user: %w[id],
+      project: %w[auto_devops_deploy_strategy auto_devops_enabled issues_enabled jobs_enabled merge_requests_enabled snippets_enabled wiki_enabled build_git_strategy build_enabled security_and_compliance_enabled requirements_enabled]
+    }
 
     Gitlab::ImportExport::Config.new.to_h[:included_attributes].each do |relation_sym, permitted_attributes|
       context "for #{relation_sym}" do
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index 6bb6be07749..1d8b137c196 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 def match_mr1_note(content_regex)
-  MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{content_regex}/)}.first
+  MergeRequest.find_by(title: 'MR1').notes.find { |n| n.note.match(/#{content_regex}/) }
 end
 
 RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
@@ -75,7 +75,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
           context 'for an Issue' do
             it 'does not import note_html' do
               note_content = 'Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi'
-              issue_note = Issue.find_by(description: 'Aliquam enim illo et possimus.').notes.select { |n| n.note.match(/#{note_content}/)}.first
+              issue_note = Issue.find_by(description: 'Aliquam enim illo et possimus.').notes.find { |n| n.note.match(/#{note_content}/) }
 
               expect(issue_note.note_html).to match(/#{note_content}/)
             end
@@ -552,7 +552,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
 
         it 'issue system note metadata restored successfully' do
           note_content = 'created merge request !1 to address this issue'
-          note = project.issues.first.notes.select { |n| n.note.match(/#{note_content}/)}.first
+          note = project.issues.first.notes.find { |n| n.note.match(/#{note_content}/)}
 
           expect(note.noteable_type).to eq('Issue')
           expect(note.system).to eq(true)
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 9daa3b32fd1..6ffe2187466 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -33,6 +33,7 @@ Issue:
 - health_status
 - external_key
 - issue_type
+- email_message_id
 Event:
 - id
 - target_type
@@ -562,6 +563,7 @@ Project:
 - autoclose_referenced_issues
 - suggestion_commit_message
 - merge_commit_template
+- squash_commit_template
 ProjectTracingSetting:
 - external_url
 Author: