Add latest changes from gitlab-org/gitlab@master

3 files changed, 66 insertions, 4 deletions

diff --git a/spec/lib/gitlab/import_export/config_spec.rb b/spec/lib/gitlab/import_export/config_spec.rb
index fcb48678b88..8f848af8bd3 100644
--- a/spec/lib/gitlab/import_export/config_spec.rb
+++ b/spec/lib/gitlab/import_export/config_spec.rb
@@ -21,10 +21,12 @@ RSpec.describe Gitlab::ImportExport::Config do
         end
 
         it 'parses default config' do
+          expected_keys = [:tree, :excluded_attributes, :included_attributes, :methods, :preloads, :export_reorders]
+          expected_keys << :include_if_exportable if ee
+
           expect { subject }.not_to raise_error
           expect(subject).to be_a(Hash)
-          expect(subject.keys).to contain_exactly(
-            :tree, :excluded_attributes, :included_attributes, :methods, :preloads, :export_reorders)
+          expect(subject.keys).to match_array(expected_keys)
         end
       end
     end
diff --git a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
index b8d18718dfb..02ac8065c9f 100644
--- a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
@@ -32,18 +32,20 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer do
   let(:hash) { { name: exportable.name, description: exportable.description }.stringify_keys }
   let(:include) { [] }
   let(:custom_orderer) { nil }
+  let(:include_if_exportable) { {} }
 
   let(:relations_schema) do
     {
       only: [:name, :description],
       include: include,
       preload: { issues: nil },
-      export_reorder: custom_orderer
+      export_reorder: custom_orderer,
+      include_if_exportable: include_if_exportable
     }
   end
 
   subject do
-    described_class.new(exportable, relations_schema, json_writer, exportable_path: exportable_path, logger: logger)
+    described_class.new(exportable, relations_schema, json_writer, exportable_path: exportable_path, logger: logger, current_user: user)
   end
 
   describe '#execute' do
@@ -210,6 +212,63 @@ RSpec.describe Gitlab::ImportExport::Json::StreamingSerializer do
         subject.execute
       end
     end
+
+    describe 'conditional export of included associations' do
+      let(:include) do
+        [{ issues: { include: [{ label_links: { include: [:label] } }] } }]
+      end
+
+      let(:include_if_exportable) do
+        { issues: [:label_links] }
+      end
+
+      let_it_be(:label) { create(:label, project: exportable) }
+      let_it_be(:link) { create(:label_link, label: label, target: issue) }
+
+      context 'when association is exportable' do
+        before do
+          allow_next_found_instance_of(Issue) do |issue|
+            allow(issue).to receive(:exportable_association?).with(:label_links, current_user: user).and_return(true)
+          end
+        end
+
+        it 'includes exportable association' do
+          expected_issue = issue.to_json(include: [{ label_links: { include: [:label] } }])
+
+          expect(json_writer).to receive(:write_relation_array).with(exportable_path, :issues, array_including(expected_issue))
+
+          subject.execute
+        end
+      end
+
+      context 'when association is not exportable' do
+        before do
+          allow_next_found_instance_of(Issue) do |issue|
+            allow(issue).to receive(:exportable_association?).with(:label_links, current_user: user).and_return(false)
+          end
+        end
+
+        it 'filters out not exportable association' do
+          expect(json_writer).to receive(:write_relation_array).with(exportable_path, :issues, array_including(issue.to_json))
+
+          subject.execute
+        end
+      end
+
+      context 'when association does not respond to exportable_association?' do
+        before do
+          allow_next_found_instance_of(Issue) do |issue|
+            allow(issue).to receive(:respond_to?).with(:exportable_association?).and_return(false)
+          end
+        end
+
+        it 'filters out not exportable association' do
+          expect(json_writer).to receive(:write_relation_array).with(exportable_path, :issues, array_including(issue.to_json))
+
+          subject.execute
+        end
+      end
+    end
   end
 
   describe '#serialize_relation' do
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 361640659b8..352255afc8d 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -586,6 +586,7 @@ ProjectFeature:
 - environments_access_level
 - feature_flags_access_level
 - releases_access_level
+- monitor_access_level
 - created_at
 - updated_at
 ProtectedBranch::MergeAccessLevel: