Add latest changes from gitlab-org/gitlab@master

5 files changed, 184 insertions, 59 deletions

diff --git a/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js b/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
index 33a3a6eddfc..380b4b92f2e 100644
--- a/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
+++ b/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
@@ -33,7 +33,13 @@ const defaultMocks = {
 describe('Incident Tabs component', () => {
   let wrapper;
 
-  const mountComponent = ({ data = {}, options = {}, mount = shallowMountExtended } = {}) => {
+  const mountComponent = ({
+    data = {},
+    options = {},
+    mount = shallowMountExtended,
+    hasLinkedAlerts = false,
+    mocks = {},
+  } = {}) => {
     wrapper = mount(
       IncidentTabs,
       merge(
@@ -54,11 +60,12 @@ describe('Incident Tabs component', () => {
             slaFeatureAvailable: true,
             canUpdate: true,
             canUpdateTimelineEvent: true,
+            hasLinkedAlerts,
           },
           data() {
             return { alert: mockAlert, ...data };
           },
-          mocks: defaultMocks,
+          mocks: { ...defaultMocks, ...mocks },
         },
         options,
       ),
@@ -102,11 +109,13 @@ describe('Incident Tabs component', () => {
     });
 
     it('renders the alert details tab', () => {
+      mountComponent({ hasLinkedAlerts: true });
       expect(findAlertDetailsTab().exists()).toBe(true);
       expect(findAlertDetailsTab().attributes('title')).toBe('Alert details');
     });
 
     it('renders the alert details table with the correct props', () => {
+      mountComponent({ hasLinkedAlerts: true });
       const alert = { iid: mockAlert.iid };
 
       expect(findAlertDetailsComponent().props('alert')).toMatchObject(alert);
diff --git a/spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb b/spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb
index 1fdb29b688e..cc3918b9678 100644
--- a/spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb
+++ b/spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb
@@ -162,6 +162,54 @@ RSpec.describe Banzai::Filter::IssuableReferenceExpansionFilter, feature_categor
 
       expect(doc.css('a').last.text).to eq("#{issue.title} (#{issue.to_reference} - closed)")
     end
+
+    it 'shows title for references with +s' do
+      issue = create_issue(:opened, title: 'Some issue')
+      link = create_link(issue.to_reference, issue: issue.id, reference_type: 'issue', reference_format: '+s')
+      doc = filter(link, context)
+
+      expect(doc.css('a').last.text).to eq("#{issue.title} (#{issue.to_reference}) • Unassigned")
+    end
+
+    context 'when extended summary props are present' do
+      let_it_be(:milestone) { create(:milestone, project: project) }
+      let_it_be(:assignees) { create_list(:user, 3) }
+      let_it_be(:issue) { create_issue(:opened, title: 'Some issue', milestone: milestone, assignees: assignees) }
+      let_it_be(:link) do
+        create_link(issue.to_reference, issue: issue.id, reference_type: 'issue', reference_format: '+s')
+      end
+
+      it 'shows extended summary for references with +s' do
+        doc = filter(link, context)
+
+        expect(doc.css('a').last.text).to eq(
+          "#{issue.title} (#{issue.to_reference}) • #{assignees[0].name}, #{assignees[1].name}+ • #{milestone.title}"
+        )
+      end
+
+      describe 'checking N+1' do
+        let_it_be(:milestone2) { create(:milestone, project: project) }
+        let_it_be(:assignees2) { create_list(:user, 3) }
+
+        it 'does not have N+1 for extended summary', :use_sql_query_cache do
+          issue2 = create_issue(:opened, title: 'Another issue', milestone: milestone2, assignees: assignees2)
+          link2 = create_link(issue2.to_reference, issue: issue2.id, reference_type: 'issue', reference_format: '+s')
+
+          # warm up
+          filter(link, context)
+
+          control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+            filter(link, context)
+          end.count
+
+          expect(control_count).to eq 9
+
+          expect do
+            filter("#{link} #{link2}", context)
+          end.not_to exceed_all_query_limit(control_count)
+        end
+      end
+    end
   end
 
   context 'for merge request references' do
@@ -235,5 +283,80 @@ RSpec.describe Banzai::Filter::IssuableReferenceExpansionFilter, feature_categor
 
       expect(doc.css('a').last.text).to eq("#{merge_request.title} (#{merge_request.to_reference})")
     end
+
+    it 'shows title for references with +s' do
+      merge_request = create_merge_request(:opened, title: 'Some merge request')
+
+      link = create_link(
+        merge_request.to_reference,
+        merge_request: merge_request.id,
+        reference_type: 'merge_request',
+        reference_format: '+s'
+      )
+
+      doc = filter(link, context)
+
+      expect(doc.css('a').last.text).to eq("#{merge_request.title} (#{merge_request.to_reference}) • Unassigned")
+    end
+
+    context 'when extended summary props are present' do
+      let_it_be(:milestone) { create(:milestone, project: project) }
+      let_it_be(:assignees) { create_list(:user, 2) }
+      let_it_be(:merge_request) do
+        create_merge_request(:opened, title: 'Some merge request', milestone: milestone, assignees: assignees)
+      end
+
+      let_it_be(:link) do
+        create_link(
+          merge_request.to_reference,
+          merge_request: merge_request.id,
+          reference_type: 'merge_request',
+          reference_format: '+s'
+        )
+      end
+
+      it 'shows extended summary for references with +s' do
+        doc = filter(link, context)
+
+        expect(doc.css('a').last.text).to eq(
+          "#{merge_request.title} (#{merge_request.to_reference}) • #{assignees[0].name}, #{assignees[1].name} • " \
+          "#{milestone.title}"
+        )
+      end
+
+      describe 'checking N+1' do
+        let_it_be(:milestone2) { create(:milestone, project: project) }
+        let_it_be(:assignees2) { create_list(:user, 3) }
+
+        it 'does not have N+1 for extended summary', :use_sql_query_cache do
+          merge_request2 = create_merge_request(
+            :closed,
+            title: 'Some merge request',
+            milestone: milestone2,
+            assignees: assignees2
+          )
+
+          link2 = create_link(
+            merge_request2.to_reference,
+            merge_request: merge_request2.id,
+            reference_type: 'merge_request',
+            reference_format: '+s'
+          )
+
+          # warm up
+          filter(link, context)
+
+          control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+            filter(link, context)
+          end.count
+
+          expect(control_count).to eq 10
+
+          expect do
+            filter("#{link} #{link2}", context)
+          end.not_to exceed_all_query_limit(control_count)
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb
index d8a97c6c3dc..aadd726ac40 100644
--- a/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/references/issue_reference_filter_spec.rb
@@ -150,6 +150,15 @@ RSpec.describe Banzai::Filter::References::IssueReferenceFilter, feature_categor
       expect(link.attr('href')).to eq(issue_url)
     end
 
+    it 'includes a data-reference-format attribute for extended summary URL references' do
+      doc = reference_filter("Issue #{issue_url}+s")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-reference-format')
+      expect(link.attr('data-reference-format')).to eq('+s')
+      expect(link.attr('href')).to eq(issue_url)
+    end
+
     it 'supports an :only_path context' do
       doc = reference_filter("Issue #{written_reference}", only_path: true)
       link = doc.css('a').first.attr('href')
diff --git a/spec/lib/banzai/filter/references/merge_request_reference_filter_spec.rb b/spec/lib/banzai/filter/references/merge_request_reference_filter_spec.rb
index 9853d6f4093..156455221cf 100644
--- a/spec/lib/banzai/filter/references/merge_request_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/references/merge_request_reference_filter_spec.rb
@@ -128,6 +128,15 @@ RSpec.describe Banzai::Filter::References::MergeRequestReferenceFilter, feature_
       expect(link.attr('href')).to eq(merge_request_url)
     end
 
+    it 'includes a data-reference-format attribute for extended summary URL references' do
+      doc = reference_filter("Merge #{merge_request_url}+s")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-reference-format')
+      expect(link.attr('data-reference-format')).to eq('+s')
+      expect(link.attr('href')).to eq(merge_request_url)
+    end
+
     it 'supports an :only_path context' do
       doc = reference_filter("Merge #{reference}", only_path: true)
       link = doc.css('a').first.attr('href')
diff --git a/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
index c351ead91eb..9de39a3ff7e 100644
--- a/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
+++ b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
@@ -289,77 +289,52 @@ RSpec.describe Gitlab::GithubImport::ParallelScheduling, feature_category: :impo
         .and_return({ title: 'One' }, { title: 'Two' }, { title: 'Three' })
     end
 
-    context 'with multiple objects' do
-      before do
-        stub_feature_flags(improved_spread_parallel_import: false)
-
-        expect(importer).to receive(:each_object_to_import).and_yield(object).and_yield(object).and_yield(object)
-      end
-
-      it 'imports data in parallel batches with delays' do
-        expect(worker_class).to receive(:bulk_perform_in)
-          .with(1.second, [
-                  [project.id, { title: 'One' }, an_instance_of(String)],
-                  [project.id, { title: 'Two' }, an_instance_of(String)],
-                  [project.id, { title: 'Three' }, an_instance_of(String)]
-                ], batch_size: batch_size, batch_delay: batch_delay)
-
-        importer.parallel_import
-      end
+    it 'imports data in parallel with delays respecting parallel_import_batch definition and return job waiter' do
+      allow(::Gitlab::JobWaiter).to receive(:generate_key).and_return('waiter-key')
+      allow(importer).to receive(:parallel_import_batch).and_return({ size: 2, delay: 1.minute })
+
+      expect(importer).to receive(:each_object_to_import)
+        .and_yield(object).and_yield(object).and_yield(object)
+      expect(worker_class).to receive(:perform_in)
+        .with(1.second, project.id, { title: 'One' }, 'waiter-key').ordered
+      expect(worker_class).to receive(:perform_in)
+        .with(1.second, project.id, { title: 'Two' }, 'waiter-key').ordered
+      expect(worker_class).to receive(:perform_in)
+        .with(1.minute + 1.second, project.id, { title: 'Three' }, 'waiter-key').ordered
+
+      job_waiter = importer.parallel_import
+
+      expect(job_waiter.key).to eq('waiter-key')
+      expect(job_waiter.jobs_remaining).to eq(3)
     end
 
-    context 'when the feature flag `improved_spread_parallel_import` is enabled' do
+    context 'when job restarts due to API rate limit or Sidekiq interruption' do
       before do
-        stub_feature_flags(improved_spread_parallel_import: true)
+        cache_key = format(described_class::JOB_WAITER_CACHE_KEY,
+          project: project.id, collection: importer.collection_method)
+        Gitlab::Cache::Import::Caching.write(cache_key, 'waiter-key')
+
+        cache_key = format(described_class::JOB_WAITER_REMAINING_CACHE_KEY,
+          project: project.id, collection: importer.collection_method)
+        Gitlab::Cache::Import::Caching.write(cache_key, 3)
       end
 
-      it 'imports data in parallel with delays respecting parallel_import_batch definition and return job waiter' do
-        allow(::Gitlab::JobWaiter).to receive(:generate_key).and_return('waiter-key')
-        allow(importer).to receive(:parallel_import_batch).and_return({ size: 2, delay: 1.minute })
+      it "restores job waiter's key and jobs_remaining" do
+        allow(importer).to receive(:parallel_import_batch).and_return({ size: 1, delay: 1.minute })
+
+        expect(importer).to receive(:each_object_to_import).and_yield(object).and_yield(object).and_yield(object)
 
-        expect(importer).to receive(:each_object_to_import)
-          .and_yield(object).and_yield(object).and_yield(object)
         expect(worker_class).to receive(:perform_in)
           .with(1.second, project.id, { title: 'One' }, 'waiter-key').ordered
         expect(worker_class).to receive(:perform_in)
-          .with(1.second, project.id, { title: 'Two' }, 'waiter-key').ordered
+          .with(1.minute + 1.second, project.id, { title: 'Two' }, 'waiter-key').ordered
         expect(worker_class).to receive(:perform_in)
-          .with(1.minute + 1.second, project.id, { title: 'Three' }, 'waiter-key').ordered
+          .with(2.minutes + 1.second, project.id, { title: 'Three' }, 'waiter-key').ordered
 
         job_waiter = importer.parallel_import
 
         expect(job_waiter.key).to eq('waiter-key')
-        expect(job_waiter.jobs_remaining).to eq(3)
-      end
-
-      context 'when job restarts due to API rate limit or Sidekiq interruption' do
-        before do
-          cache_key = format(described_class::JOB_WAITER_CACHE_KEY,
-            project: project.id, collection: importer.collection_method)
-          Gitlab::Cache::Import::Caching.write(cache_key, 'waiter-key')
-
-          cache_key = format(described_class::JOB_WAITER_REMAINING_CACHE_KEY,
-            project: project.id, collection: importer.collection_method)
-          Gitlab::Cache::Import::Caching.write(cache_key, 3)
-        end
-
-        it "restores job waiter's key and jobs_remaining" do
-          allow(importer).to receive(:parallel_import_batch).and_return({ size: 1, delay: 1.minute })
-
-          expect(importer).to receive(:each_object_to_import).and_yield(object).and_yield(object).and_yield(object)
-
-          expect(worker_class).to receive(:perform_in)
-            .with(1.second, project.id, { title: 'One' }, 'waiter-key').ordered
-          expect(worker_class).to receive(:perform_in)
-            .with(1.minute + 1.second, project.id, { title: 'Two' }, 'waiter-key').ordered
-          expect(worker_class).to receive(:perform_in)
-            .with(2.minutes + 1.second, project.id, { title: 'Three' }, 'waiter-key').ordered
-
-          job_waiter = importer.parallel_import
-
-          expect(job_waiter.key).to eq('waiter-key')
-          expect(job_waiter.jobs_remaining).to eq(6)
-        end
+        expect(job_waiter.jobs_remaining).to eq(6)
       end
     end
   end