.rubocop_todo/lint/redundant_cop_disable_directive.yml

 ---
 # Cop supports --auto-correct.
 Lint/RedundantCopDisableDirective:
-  Details: grace period
+  # Used to be enabled in "grace period" and is now disabled due to too many
+  # silenced offenses.
+  # See https://gitlab.com/gitlab-org/gitlab/-/issues/376133
+  Enabled: false
   Exclude:
     - 'app/controllers/concerns/enforces_two_factor_authentication.rb'
     - 'app/controllers/concerns/web_hooks/hook_log_actions.rb'

.rubocop_todo/rspec/multiple_memoized_helpers.yml

@@ -33,6 +33,7 @@ RSpec/MultipleMemoizedHelpers:
     - 'spec/services/merge_requests/push_options_handler_service_spec.rb'
     - 'spec/services/packages/cleanup/execute_policy_service_spec.rb'
     - 'spec/services/todo_service_spec.rb'
+    - 'spec/services/todos/allowed_target_filter_service_spec.rb'
     - 'spec/services/todos/destroy/entity_leave_service_spec.rb'
     - 'spec/support/shared_contexts/policies/project_policy_shared_context.rb'
     - 'spec/support/shared_contexts/requests/api/debian_repository_shared_context.rb'

GITALY_SERVER_VERSION

-5cba52f4acb04ddbe27d8b7cb2e936ea0be45ae1
+4c15523cf680c107c5aa2b8268674cd0345a6b78

doc/ci/pipelines/cicd_minutes.md

@@ -205,7 +205,7 @@ The cost factors for jobs running on shared runners on GitLab.com are:
 - `0.5` for public projects in the [GitLab for Open Source program](../../subscriptions/index.md#gitlab-for-open-source).
 - `0.008` for public forks of public projects in the [GitLab for Open Source program](../../subscriptions/index.md#gitlab-for-open-source). For every 125 minutes of job execution time,
   you use 1 CI/CD minute.
-- `0.04` for other public projects, after September 1, 2022 (previously `0.008`).
+- `1` for other public projects, after October 1, 2022 (previously `0.04`).
   For every 25 minutes of job execution time, you use 1 CI/CD minute.
 - Calculated differently for [community contributions to GitLab projects](#cost-factor-for-community-contributions-to-gitlab-projects).
 

ee/lib/elastic/latest/config.rb

@@ -7,15 +7,6 @@ module Config
       extend Elasticsearch::Model::Indexing::ClassMethods
       extend Elasticsearch::Model::Naming::ClassMethods
 
-      # Regex patterns, Elasticsearch regex requires backslash characters to be escaped
-      # Single quotes are used to store the patterns and ruby will escape the \ appropriately
-      ANY_CASE_WORD_PATTERN = '(\p{Ll}+|\p{Lu}\p{Ll}+|\p{Lu}+)' # match words with any upper/lowercase combination
-      CAMEL_CASE_WORD_PATTERN = '(?=([\p{Lu}]+[\p{L}]+))' # match camel cased words, used to split into smaller tokens
-      CODE_TOKEN_PATTERN = '([\p{L}\d_]+)' # letters, numbers & underscores are the most common tokens in programming. Always capture them greedily regardless of context.
-      DIGIT_PATTERN = '(\d+)' # match digits of any length
-      FILE_NAME_PATTERN = '([\p{L}\p{N}_.-]+)' # some common chars in file names to keep the whole filename intact (eg. my_file-name-01.txt)
-      PERIOD_PATTERN = '\.([^.]+)(?=\.|\s|\Z)' # separate terms on periods
-
       self.index_name = [Rails.application.class.module_parent_name.downcase, Rails.env].join('-')
 
       settings \
@@ -50,12 +41,7 @@ module Config
               code_analyzer: {
                 type: 'custom',
                 tokenizer: 'whitespace',
-                filter: %w(code lowercase asciifolding remove_duplicates)
-              },
-              code_search_analyzer: {
-                type: 'custom',
-                tokenizer: 'whitespace',
-                filter: %w(lowercase asciifolding)
+                filter: %w(word_delimiter_graph_filter flatten_graph lowercase asciifolding remove_duplicates)
               },
               whitespace_reverse: {
                 tokenizer: 'whitespace',
@@ -63,17 +49,9 @@ module Config
               }
             },
             filter: {
-              code: {
-                type: "pattern_capture",
-                preserve_original: true,
-                patterns: [
-                  ANY_CASE_WORD_PATTERN,
-                  CAMEL_CASE_WORD_PATTERN,
-                  CODE_TOKEN_PATTERN,
-                  DIGIT_PATTERN,
-                  FILE_NAME_PATTERN,
-                  PERIOD_PATTERN
-                ]
+              word_delimiter_graph_filter: {
+                type: 'word_delimiter_graph',
+                preserve_original: true
               }
             },
             tokenizer: {
@@ -193,10 +171,10 @@ module Config
           indexes :commit_sha, type: :keyword, index_options: 'docs', normalizer: :sha_normalizer
           indexes :path, type: :text, analyzer: :path_analyzer
           indexes :file_name,
-            type: :text, analyzer: :code_analyzer, search_analyzer: :code_search_analyzer,
+            type: :text, analyzer: :code_analyzer,
             fields: { reverse: { type: :text, analyzer: :whitespace_reverse } }
           indexes :content,
-            type: :text, index_options: 'positions', analyzer: :code_analyzer, search_analyzer: :code_search_analyzer
+            type: :text, index_options: 'positions', analyzer: :code_analyzer
           indexes :language, type: :keyword
         end
 

ee/spec/frontend/vue_shared/components/reports/report_issues_spec.js

 import { mount } from '@vue/test-utils';
-import Vue from 'vue';
 import { componentNames } from 'ee/reports/components/issue_body';
 import { codequalityParsedIssues } from 'ee_jest/vue_merge_request_widget/mock_data';
 import SecurityIssueBody from 'ee/vue_shared/security_reports/components/security_issue_body.vue';
-import store from 'ee/vue_shared/security_reports/store';
 import {
   sastParsedIssues,
   dockerReportParsed,
   parsedDast,
   secretDetectionParsedIssues,
 } from 'ee_jest/vue_shared/security_reports/mock_data';
-import mountComponent, { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
-import reportIssues from '~/reports/components/report_item.vue';
+import ReportIssues from '~/reports/components/report_item.vue';
 import { STATUS_FAILED, STATUS_SUCCESS } from '~/reports/constants';
 
 describe('Report issues', () => {
-  let vm;
   let wrapper;
-  let ReportIssues;
-
-  beforeEach(() => {
-    ReportIssues = Vue.extend(reportIssues);
-  });
 
   afterEach(() => {
-    if (vm?.$destroy) vm.$destroy();
-
-    if (wrapper) wrapper.destroy();
+    wrapper.destroy();
   });
 
   describe('for codequality issues', () => {
     describe('resolved issues', () => {
       beforeEach(() => {
-        vm = mountComponent(ReportIssues, {
-          issue: codequalityParsedIssues[0],
-          component: componentNames.CodequalityIssueBody,
-          status: STATUS_SUCCESS,
+        wrapper = mount(ReportIssues, {
+          propsData: {
+            issue: codequalityParsedIssues[0],
+            component: componentNames.CodequalityIssueBody,
+            status: STATUS_SUCCESS,
+          },
         });
       });
 
       it('should render "Fixed" keyword', () => {
-        expect(vm.$el.textContent).toContain('Fixed');
-        expect(vm.$el.textContent.replace(/\s+/g, ' ').trim()).toEqual(
+        expect(wrapper.text()).toContain('Fixed');
+        expect(wrapper.text()).toMatchInterpolatedText(
           'Fixed: Minor - Insecure Dependency in Gemfile.lock:12',
         );
       });
@@ -49,22 +40,24 @@ describe('Report issues', () => {
 
     describe('unresolved issues', () => {
       beforeEach(() => {
-        vm = mountComponent(ReportIssues, {
-          issue: codequalityParsedIssues[0],
-          component: componentNames.CodequalityIssueBody,
-          status: STATUS_FAILED,
+        wrapper = mount(ReportIssues, {
+          propsData: {
+            issue: codequalityParsedIssues[0],
+            component: componentNames.CodequalityIssueBody,
+            status: STATUS_FAILED,
+          },
         });
       });
 
       it('should not render "Fixed" keyword', () => {
-        expect(vm.$el.textContent).not.toContain('Fixed');
+        expect(wrapper.text()).not.toContain('Fixed');
       });
     });
   });
 
   describe('with location', () => {
     it('should render location', () => {
-      vm = mount(ReportIssues, {
+      wrapper = mount(ReportIssues, {
         propsData: {
           issue: sastParsedIssues[0],
           component: componentNames.SecurityIssueBody,
@@ -75,8 +68,8 @@ describe('Report issues', () => {
         },
       });
 
-      expect(vm.text()).toContain('in');
-      expect(vm.find('.report-block-list-issue a').attributes('href')).toEqual(
+      expect(wrapper.text()).toContain('in');
+      expect(wrapper.find('.report-block-list-issue a').attributes('href')).toEqual(
         sastParsedIssues[0].urlPath,
       );
     });
@@ -84,36 +77,38 @@ describe('Report issues', () => {
 
   describe('without location', () => {
     it('should not render location', () => {
-      vm = mountComponent(ReportIssues, {
-        issue: {
-          title: 'foo',
+      wrapper = mount(ReportIssues, {
+        propsData: {
+          issue: {
+            title: 'foo',
+          },
+          component: componentNames.SecurityIssueBody,
+          status: STATUS_SUCCESS,
         },
-        component: componentNames.SecurityIssueBody,
-        status: STATUS_SUCCESS,
       });
 
-      expect(vm.$el.textContent).not.toContain('in');
-      expect(vm.$el.querySelector('.report-block-list-issue a')).toEqual(null);
+      expect(wrapper.text()).not.toContain('in');
+      expect(wrapper.find('.report-block-list-issue a').exists()).toBe(false);
     });
   });
 
   describe('for container scanning issues', () => {
     beforeEach(() => {
-      vm = mountComponent(ReportIssues, {
-        issue: dockerReportParsed.unapproved[0],
-        component: componentNames.SecurityIssueBody,
-        status: STATUS_FAILED,
+      wrapper = mount(ReportIssues, {
+        propsData: {
+          issue: dockerReportParsed.unapproved[0],
+          component: componentNames.SecurityIssueBody,
+          status: STATUS_FAILED,
+        },
       });
     });
 
     it('renders severity', () => {
-      expect(vm.$el.textContent.trim().toLowerCase()).toContain(
-        dockerReportParsed.unapproved[0].severity,
-      );
+      expect(wrapper.text().toLowerCase()).toContain(dockerReportParsed.unapproved[0].severity);
     });
 
     it('renders CVE name', () => {
-      expect(vm.$el.querySelector('.report-block-list-issue button').textContent.trim()).toEqual(
+      expect(wrapper.find('.report-block-list-issue button').text()).toEqual(
         dockerReportParsed.unapproved[0].title,
       );
     });
@@ -121,9 +116,8 @@ describe('Report issues', () => {
 
   describe('for dast issues', () => {
     beforeEach(() => {
-      vm = mountComponentWithStore(ReportIssues, {
-        store,
-        props: {
+      wrapper = mount(ReportIssues, {
+        propsData: {
           issue: parsedDast[0],
           component: componentNames.SecurityIssueBody,
           status: STATUS_FAILED,
@@ -132,28 +126,28 @@ describe('Report issues', () => {
     });
 
     it('renders severity and title', () => {
-      expect(vm.$el.textContent).toContain(parsedDast[0].title);
-      expect(vm.$el.textContent.toLowerCase()).toContain(`${parsedDast[0].severity}`);
+      expect(wrapper.text()).toContain(parsedDast[0].title);
+      expect(wrapper.text().toLowerCase()).toContain(`${parsedDast[0].severity}`);
     });
   });
 
   describe('for secret Detection issues', () => {
     beforeEach(() => {
-      vm = mountComponent(ReportIssues, {
-        issue: secretDetectionParsedIssues[0],
-        component: componentNames.SecurityIssueBody,
-        status: STATUS_FAILED,
+      wrapper = mount(ReportIssues, {
+        propsData: {
+          issue: secretDetectionParsedIssues[0],
+          component: componentNames.SecurityIssueBody,
+          status: STATUS_FAILED,
+        },
       });
     });
 
     it('renders severity', () => {
-      expect(vm.$el.textContent.trim().toLowerCase()).toContain(
-        secretDetectionParsedIssues[0].severity,
-      );
+      expect(wrapper.text().toLowerCase()).toContain(secretDetectionParsedIssues[0].severity);
     });
 
     it('renders CVE name', () => {
-      expect(vm.$el.querySelector('.report-block-list-issue button').textContent.trim()).toEqual(
+      expect(wrapper.find('.report-block-list-issue button').text()).toEqual(
         secretDetectionParsedIssues[0].title,
       );
     });

ee/spec/frontend/vue_shared/components/reports/report_item_spec.js

 import { mount } from '@vue/test-utils';
-import Vue from 'vue';
 import { componentNames, iconComponentNames } from 'ee/reports/components/issue_body';
 import { codequalityParsedIssues } from 'ee_jest/vue_merge_request_widget/mock_data';
 import LicenseIssueBody from 'ee/vue_shared/license_compliance/components/license_issue_body.vue';
 import LicenseStatusIcon from 'ee/vue_shared/license_compliance/components/license_status_icon.vue';
 import SecurityIssueBody from 'ee/vue_shared/security_reports/components/security_issue_body.vue';
-import store from 'ee/vue_shared/security_reports/store';
 import {
   sastParsedIssues,
   dockerReportParsed,
@@ -13,38 +11,31 @@ import {
   secretDetectionParsedIssues,
   licenseComplianceParsedIssues,
 } from 'ee_jest/vue_shared/security_reports/mock_data';
-import mountComponent, { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
-import reportIssue from '~/reports/components/report_item.vue';
+import ReportIssue from '~/reports/components/report_item.vue';
 import { STATUS_FAILED, STATUS_SUCCESS, STATUS_NEUTRAL } from '~/reports/constants';
 
 describe('Report issue', () => {
-  let vm;
   let wrapper;
-  let ReportIssue;
-
-  beforeEach(() => {
-    ReportIssue = Vue.extend(reportIssue);
-  });
 
   afterEach(() => {
-    if (vm?.$destroy) vm.$destroy();
-
-    if (wrapper) wrapper.destroy();
+    wrapper.destroy();
   });
 
   describe('for codequality issue', () => {
     describe('resolved issue', () => {
       beforeEach(() => {
-        vm = mountComponent(ReportIssue, {
-          issue: codequalityParsedIssues[0],
-          component: componentNames.CodequalityIssueBody,
-          status: STATUS_SUCCESS,
+        wrapper = mount(ReportIssue, {
+          propsData: {
+            issue: codequalityParsedIssues[0],
+            component: componentNames.CodequalityIssueBody,
+            status: STATUS_SUCCESS,
+          },
         });
       });
 
       it('should render "Fixed" keyword', () => {
-        expect(vm.$el.textContent).toContain('Fixed');
-        expect(vm.$el.textContent.replace(/\s+/g, ' ').trim()).toEqual(
+        expect(wrapper.text()).toContain('Fixed');
+        expect(wrapper.text()).toMatchInterpolatedText(
           'Fixed: Minor - Insecure Dependency in Gemfile.lock:12',
         );
       });
@@ -52,22 +43,24 @@ describe('Report issue', () => {
 
     describe('unresolved issue', () => {
       beforeEach(() => {
-        vm = mountComponent(ReportIssue, {
-          issue: codequalityParsedIssues[0],
-          component: componentNames.CodequalityIssueBody,
-          status: STATUS_FAILED,
+        wrapper = mount(ReportIssue, {
+          propsData: {
+            issue: codequalityParsedIssues[0],
+            component: componentNames.CodequalityIssueBody,
+            status: STATUS_FAILED,
+          },
         });
       });
 
       it('should not render "Fixed" keyword', () => {
-        expect(vm.$el.textContent).not.toContain('Fixed');
+        expect(wrapper.text()).not.toContain('Fixed');
       });
     });
   });
 
   describe('with location', () => {
     it('should render location', () => {
-      vm = mount(ReportIssue, {
+      wrapper = mount(ReportIssue, {
         propsData: {
           issue: sastParsedIssues[0],
           component: componentNames.SecurityIssueBody,
@@ -78,14 +71,14 @@ describe('Report issue', () => {
         },
       });
 
-      expect(vm.text()).toContain('in');
-      expect(vm.find('li a').attributes('href')).toEqual(sastParsedIssues[0].urlPath);
+      expect(wrapper.text()).toContain('in');
+      expect(wrapper.find('li a').attributes('href')).toEqual(sastParsedIssues[0].urlPath);
     });
   });
 
   describe('without location', () => {
     it('should not render location', () => {
-      vm = mount(ReportIssue, {
+      wrapper = mount(ReportIssue, {
         propsData: {
           issue: {
             title: 'foo',
@@ -98,38 +91,35 @@ describe('Report issue', () => {
         },
       });
 
-      expect(vm.text()).not.toContain('in');
-      expect(vm.find('a').exists()).toBe(false);
+      expect(wrapper.text()).not.toContain('in');
+      expect(wrapper.find('a').exists()).toBe(false);
     });
   });
 
   describe('for container scanning issue', () => {
     beforeEach(() => {
-      vm = mountComponent(ReportIssue, {
-        issue: dockerReportParsed.unapproved[0],
-        component: componentNames.SecurityIssueBody,
-        status: STATUS_FAILED,
+      wrapper = mount(ReportIssue, {
+        propsData: {
+          issue: dockerReportParsed.unapproved[0],
+          component: componentNames.SecurityIssueBody,
+          status: STATUS_FAILED,
+        },
       });
     });
 
     it('renders severity', () => {
-      expect(vm.$el.textContent.trim().toLowerCase()).toContain(
-        dockerReportParsed.unapproved[0].severity,
-      );
+      expect(wrapper.text().toLowerCase()).toContain(dockerReportParsed.unapproved[0].severity);
     });
 
     it('renders CVE name', () => {
-      expect(vm.$el.querySelector('button').textContent.trim()).toEqual(
-        dockerReportParsed.unapproved[0].title,
-      );
+      expect(wrapper.find('button').text()).toEqual(dockerReportParsed.unapproved[0].title);
     });
   });
 
   describe('for dast issue', () => {
     beforeEach(() => {
-      vm = mountComponentWithStore(ReportIssue, {
-        store,
-        props: {
+      wrapper = mount(ReportIssue, {
+        propsData: {
           issue: parsedDast[0],
           component: componentNames.SecurityIssueBody,
           status: STATUS_FAILED,
@@ -138,30 +128,28 @@ describe('Report issue', () => {
     });
 
     it('renders severity and title', () => {
-      expect(vm.$el.textContent).toContain(parsedDast[0].title);
-      expect(vm.$el.textContent.toLowerCase()).toContain(`${parsedDast[0].severity}`);
+      expect(wrapper.text()).toContain(parsedDast[0].title);
+      expect(wrapper.text().toLowerCase()).toContain(`${parsedDast[0].severity}`);
     });
   });
 
   describe('for secret Description issue', () => {
     beforeEach(() => {
-      vm = mountComponent(ReportIssue, {
-        issue: secretDetectionParsedIssues[0],
-        component: componentNames.SecurityIssueBody,
-        status: STATUS_FAILED,
+      wrapper = mount(ReportIssue, {
+        propsData: {
+          issue: secretDetectionParsedIssues[0],
+          component: componentNames.SecurityIssueBody,
+          status: STATUS_FAILED,
+        },
       });
     });
 
     it('renders severity', () => {
-      expect(vm.$el.textContent.trim().toLowerCase()).toContain(
-        secretDetectionParsedIssues[0].severity,
-      );
+      expect(wrapper.text().toLowerCase()).toContain(secretDetectionParsedIssues[0].severity);
     });
 
     it('renders CVE name', () => {
-      expect(vm.$el.querySelector('button').textContent.trim()).toEqual(
-        secretDetectionParsedIssues[0].title,
-      );
+      expect(wrapper.find('button').text()).toEqual(secretDetectionParsedIssues[0].title);
     });
   });
 
@@ -187,9 +175,8 @@ describe('Report issue', () => {
 
   describe('showReportSectionStatusIcon', () => {
     it('does not render CI Status Icon when showReportSectionStatusIcon is false', () => {
-      vm = mountComponentWithStore(ReportIssue, {
-        store,
-        props: {
+      wrapper = mount(ReportIssue, {
+        propsData: {
           issue: parsedDast[0],
           component: componentNames.SecurityIssueBody,
           status: STATUS_SUCCESS,
@@ -197,20 +184,19 @@ describe('Report issue', () => {
         },
       });
 
-      expect(vm.$el.querySelectorAll('.report-block-list-icon')).toHaveLength(0);
+      expect(wrapper.findAll('.report-block-list-icon')).toHaveLength(0);
     });
 
     it('shows status icon when unspecified', () => {
-      vm = mountComponentWithStore(ReportIssue, {
-        store,
-        props: {
+      wrapper = mount(ReportIssue, {
+        propsData: {
           issue: parsedDast[0],
           component: componentNames.SecurityIssueBody,
           status: STATUS_SUCCESS,
         },
       });
 
-      expect(vm.$el.querySelectorAll('.report-block-list-icon')).toHaveLength(1);
+      expect(wrapper.findAll('.report-block-list-icon')).toHaveLength(1);
     });
   });
 });

ee/spec/frontend/vue_shared/license_compliance/components/license_packages_spec.js

-import Vue, { nextTick } from 'vue';
+import { mount } from '@vue/test-utils';
 
 import LicensePackages from 'ee/vue_shared/license_compliance/components/license_packages.vue';
-import mountComponent from 'helpers/vue_mount_component_helper';
 import { licenseReport } from '../mock_data';
 
 const examplePackages = licenseReport[0].packages;
 
-const createComponent = (packages = examplePackages) => {
-  const Component = Vue.extend(LicensePackages);
-
-  return mountComponent(Component, { packages });
-};
-
 describe('LicensePackages', () => {
-  let vm;
+  let wrapper;
 
-  beforeEach(() => {
-    vm = createComponent();
-  });
+  const createComponent = (packages = examplePackages) => {
+    wrapper = mount(LicensePackages, { propsData: { packages } });
+  };
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
-  describe('computed', () => {
-    describe('remainingPackages', () => {
-      it('returns string with count of packages when it exceeds `displayPackageCount` prop', () => {
-        expect(vm.remainingPackages).toBe('2 more');
-      });
-
-      it('returns empty string when count of packages does not exceed `displayPackageCount` prop', async () => {
-        vm.displayPackageCount = examplePackages.length + 1;
-        await nextTick();
-        expect(vm.remainingPackages).toBe('');
-      });
-    });
+  const findShowAllPackagesButton = () => wrapper.find('.btn-show-all-packages');
+  const findLicenseDependecies = () => wrapper.find('.js-license-dependencies');
+
+  it('renders packages list for a particular license', () => {
+    createComponent();
+
+    const packages = findLicenseDependecies();
+
+    expect(packages.exists()).toBe(true);
+    expect(packages.text()).toBe('Used by pg, puma, foo, and');
   });
 
-  describe('methods', () => {
-    describe('handleShowPackages', () => {
-      it('sets value of `showAllPackages` prop to true', () => {
-        vm.showAllPackages = false;
-        vm.handleShowPackages();
+  it('renders more packages button element', () => {
+    createComponent();
+
+    const button = findShowAllPackagesButton();
 
-        expect(vm.showAllPackages).toBe(true);
-      });
-    });
+    expect(button.exists()).toBe(true);
+    expect(button.text()).toBe('2 more');
   });
 
-  describe('template', () => {
-    it('renders packages list for a particular license', () => {
-      const packagesEl = vm.$el.querySelector('.js-license-dependencies');
+  it('does not render more packages button when count of packages does not exceed `displayPackageCount`', () => {
+    createComponent(examplePackages.slice(0, 1));
+
+    expect(findShowAllPackagesButton().exists()).toBe(false);
+  });
 
-      expect(packagesEl).not.toBeNull();
-      expect(packagesEl.innerText.trim()).toBe('Used by pg, puma, foo, and');
-    });
+  it('renders all packages when show all packages button is clicked', async () => {
+    createComponent();
 
-    it('renders more packages button element', () => {
-      const buttonEl = vm.$el.querySelector('.btn-show-all-packages');
+    await findShowAllPackagesButton().trigger('click');
 
-      expect(buttonEl).not.toBeNull();
-      expect(buttonEl.innerText.trim()).toBe('2 more');
-    });
+    expect(findLicenseDependecies().text()).toBe('Used by pg, puma, foo, bar, and baz');
   });
 });

ee/spec/lib/gitlab/elastic/search_results_spec.rb

@@ -888,82 +888,67 @@ def search_for(term)
       end
     end
 
-    context 'searches with special characters' do
-      shared_examples_for 'finds the file' do
-        before do
-          examples.each do |file_content, _|
-            file_name = Digest::SHA256.hexdigest(file_content)
-            project_1.repository.create_file(user, file_name, file_content, message: 'Some commit message', branch_name: 'master')
-          end
-
-          project_1.repository.index_commits_and_blobs
-          ensure_elasticsearch_index!
-        end
-
-        it 'finds all examples' do
-          examples.each do |file_content, search_term|
-            file_name = Digest::SHA256.hexdigest(file_content)
-
-            expect(search_for(search_term)).to include(file_name), "failed to find #{search_term}"
-          end
-        end
+    context 'searches with special characters', :aggregate_failures do
+      let(:examples) do
+        {
+          'perlMethodCall' => '$my_perl_object->perlMethodCall',
+          '"absolute_with_specials.txt"' => '/a/longer/file-path/absolute_with_specials.txt',
+          '"components-within-slashes"' => '/file-path/components-within-slashes/',
+          'bar\(x\)' => 'Foo.bar(x)',
+          'someSingleColonMethodCall' => 'LanguageWithSingleColon:someSingleColonMethodCall',
+          'javaLangStaticMethodCall' => 'MyJavaClass::javaLangStaticMethodCall',
+          'tokenAfterParentheses' => 'ParenthesesBetweenTokens)tokenAfterParentheses',
+          'ruby_call_method_123' => 'RubyClassInvoking.ruby_call_method_123(with_arg)',
+          'ruby_method_call' => 'RubyClassInvoking.ruby_method_call(with_arg)',
+          '#ambitious-planning' => 'We [plan ambitiously](#ambitious-planning).',
+          'ambitious-planning' => 'We [plan ambitiously](#ambitious-planning).',
+          'tokenAfterCommaWithNoSpace' => 'WouldHappenInManyLanguages,tokenAfterCommaWithNoSpace',
+          'missing_token_around_equals' => 'a.b.c=missing_token_around_equals',
+          'and;colons:too$' => 'and;colons:too$',
+          '"differeñt-lønguage.txt"' => 'another/file-path/differeñt-lønguage.txt',
+          '"relative-with-specials.txt"' => 'another/file-path/relative-with-specials.txt',
+          'ruby_method_123' => 'def self.ruby_method_123(ruby_another_method_arg)',
+          'ruby_method_name' => 'def self.ruby_method_name(ruby_method_arg)',
+          '"dots.also.need.testing"' => 'dots.also.need.testing',
+          '.testing' => 'dots.also.need.testing',
+          'dots' => 'dots.also.need.testing',
+          'also.need' => 'dots.also.need.testing',
+          'need' => 'dots.also.need.testing',
+          'tests-image' => 'extends: .gitlab-tests-image',
+          'gitlab-tests' => 'extends: .gitlab-tests-image',
+          'gitlab-tests-image' => 'extends: .gitlab-tests-image',
+          'foo/bar' => 'https://s3.amazonaws.com/foo/bar/baz.png',
+          'https://test.or.dev.com/repository' => 'https://test.or.dev.com/repository/maven-all',
+          'test.or.dev.com/repository/maven-all' => 'https://test.or.dev.com/repository/maven-all',
+          'repository/maven-all' => 'https://test.or.dev.com/repository/maven-all',
+          'https://test.or.dev.com/repository/maven-all' => 'https://test.or.dev.com/repository/maven-all',
+          'bar-baz-conventions' => 'id("foo.bar-baz-conventions")',
+          'baz-conventions' => 'id("foo.bar-baz-conventions")',
+          'baz' => 'id("foo.bar-baz-conventions")',
+          'bikes-3.4' => 'include "bikes-3.4"',
+          'sql_log_bin' => 'q = "SET @@session.sql_log_bin=0;"',
+          'sql_log_bin=0' => 'q = "SET @@session.sql_log_bin=0;"',
+          'v3/delData' => 'uri: "v3/delData"',
+          '"us-east-2"' => 'us-east-2'
+        }
       end
 
-      context 'unsupported', :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/346914' do
-        let(:examples) do
-          {
-            'https://s3.amazonaws.com/foo/bar/baz.png' => 'foo/bar',
-            'https://test.or.dev.com/repository/maven-all v1' => 'https://test.or.dev.com/repository',
-            'https://test.or.dev.com/repository/maven-all v2' => 'test.or.dev.com/repository/maven-all',
-            'https://test.or.dev.com/repository/maven-all v3' => 'repository/maven-all',
-            'id("foo.bar-baz-conventions") v1' => 'bar-baz-conventions',
-            'id("foo.bar-baz-conventions") v2' => 'baz-conventions',
-            'extends: .gitlab-tests-image v1' => 'tests-image',
-            'extends: .gitlab-tests-image v2' => 'gitlab-tests',
-            'We [plan ambitiously](#ambitious-planning).' => '#ambitious-planning',
-            'dots.also.need.testing v1' => '.testing',
-            'dots.also.need.testing v2' => 'dots.need',
-            'q = "SET @@session.sql_log_bin=0;"' => 'sql_log_bin=0',
-            'uri: "v3/delData",' => 'v3/delData'
-          }
+      before do
+        examples.values.uniq.each do |file_content|
+          file_name = Digest::SHA256.hexdigest(file_content)
+          project_1.repository.create_file(user, file_name, file_content, message: 'Some commit message', branch_name: 'master')
         end
 
-        it_behaves_like 'finds the file'
+        project_1.repository.index_commits_and_blobs
+        ensure_elasticsearch_index!
       end
 
-      context 'currently supported', :aggregate_failures do
-        let(:examples) do
-          {
-            'https://test.or.dev.com/repository/maven-all' => 'https://test.or.dev.com/repository/maven-all',
-            'id("foo.bar-baz-conventions")' => 'baz',
-            'extends: .gitlab-tests-image' => 'gitlab-tests-image',
-            'We [plan ambitiously](#ambitious-planning).' => 'ambitious-planning',
-            'us-east-2' => '"us-east-2"',
-            'include "bikes-3.4"' => 'bikes-3.4',
-            'dots.also.need.testing v1' => '"dots.also.need.testing"',
-            'dots.also.need.testing v2' => 'dots',
-            'dots.also.need.testing v3' => 'need',
-            'and;colons:too$' => "and;colons:too$",
-            'Foo.bar(x)' => 'bar\(x\)',
-            '/a/longer/file-path/absolute_with_specials.txt' => '"absolute_with_specials.txt"',
-            'another/file-path/relative-with-specials.txt' => '"relative-with-specials.txt"',
-            '/file-path/components-within-slashes/' => '"components-within-slashes"',
-            'another/file-path/differeñt-lønguage.txt' => '"differeñt-lønguage.txt"',
-            'MyJavaClass::javaLangStaticMethodCall' => 'javaLangStaticMethodCall',
-            '$my_perl_object->perlMethodCall' => 'perlMethodCall',
-            'LanguageWithSingleColon:someSingleColonMethodCall' => 'someSingleColonMethodCall',
-            'WouldHappenInManyLanguages,tokenAfterCommaWithNoSpace' => 'tokenAfterCommaWithNoSpace',
-            'ParenthesesBetweenTokens)tokenAfterParentheses' => 'tokenAfterParentheses',
-            'a.b.c=missing_token_around_equals' => 'missing_token_around_equals',
-            'def self.ruby_method_name(ruby_method_arg)' => 'ruby_method_name',
-            'def self.ruby_method_123(ruby_another_method_arg)' => 'ruby_method_123',
-            'RubyClassInvoking.ruby_method_call(with_arg)' => 'ruby_method_call',
-            'RubyClassInvoking.ruby_call_method_123(with_arg)' => 'ruby_call_method_123',
-            'q = "SET @@session.sql_log_bin=0;"' => 'sql_log_bin'
-          }
-        end
+      it 'finds all examples' do
+        examples.each do |search_term, file_content|
+          file_name = Digest::SHA256.hexdigest(file_content)
 
-        it_behaves_like 'finds the file'
+          expect(search_for(search_term)).to include(file_name), "failed to find #{search_term}"
+        end
       end
     end
 

package.json

@@ -53,7 +53,7 @@
     "@gitlab/at.js": "1.5.7",
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/svgs": "3.4.0",
-    "@gitlab/ui": "43.18.0",
+    "@gitlab/ui": "43.20.0",
     "@gitlab/visual-review-tools": "1.7.3",
     "@gitlab/web-ide": "0.0.1-dev-20220815034418",
     "@rails/actioncable": "6.1.4-7",

spec/support/capybara_slow_finder.rb

+# frozen_string_literal: true
+
+module Capybara
+  MESSAGE = <<~MSG
+    Timeout reached while running a waiting Capybara finder. Consider using a non-waiting finder.
+    See https://www.cloudbees.com/blog/faster-rails-tests
+  MSG
+
+  module Node
+    class Base
+      # Inspired by https://github.com/ngauthier/capybara-slow_finder_errors
+      module SlowFinder
+        def synchronize(seconds = nil, errors: nil)
+          start_time = Gitlab::Metrics::System.monotonic_time
+
+          super
+        rescue Capybara::ElementNotFound => e
+          seconds ||= Capybara.default_max_wait_time
+
+          raise e unless seconds > 0 && Gitlab::Metrics::System.monotonic_time - start_time > seconds
+
+          raise e, "#{$!}#{MESSAGE}", e.backtrace
+        end
+      end
+
+      prepend SlowFinder
+    end
+  end
+end

spec/support_specs/capybara_slow_finder_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Capybara::Node::Base::SlowFinder do # rubocop:disable RSpec/FilePath
+  context 'without timeout' do
+    context 'when element is found' do
+      let(:slow_finder) do
+        Class.new do
+          def synchronize(seconds = nil, errors: nil)
+            true
+          end
+
+          prepend Capybara::Node::Base::SlowFinder
+        end.new
+      end
+
+      it 'does not raise error' do
+        expect { slow_finder.synchronize }.not_to raise_error
+      end
+    end
+
+    context 'when element is not found' do
+      let(:slow_finder) do
+        Class.new do
+          def synchronize(seconds = nil, errors: nil)
+            raise Capybara::ElementNotFound
+          end
+
+          prepend Capybara::Node::Base::SlowFinder
+        end.new
+      end
+
+      it 'raises Capybara::ElementNotFound error' do
+        expect { slow_finder.synchronize }.to raise_error(Capybara::ElementNotFound)
+      end
+    end
+  end
+
+  context 'with timeout' do
+    let(:slow_finder) do
+      Class.new do
+        def synchronize(seconds = nil, errors: nil)
+          sleep 0.1
+
+          raise Capybara::ElementNotFound
+        end
+
+        prepend Capybara::Node::Base::SlowFinder
+      end.new
+    end
+
+    it 'raises a timeout error' do
+      expect { slow_finder.synchronize(0.01) }.to raise_error(
+        Capybara::ElementNotFound,
+        /Timeout reached while running a waiting Capybara finder./
+      )
+    end
+  end
+end

yarn.lock

@@ -1074,10 +1074,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.4.0.tgz#cfc8319e259e5914ad0f48ee0ab6e0eec75d03da"
   integrity sha512-myCYbjViOI2k6oHGRqL1iKaMKbYvPqWL6tYZ07QkUKziVz5kYjECWk5c0Qp6yu9NsFAMWuow5PkR3oFTGBHmbg==
-"@gitlab/ui@43.18.0":
-  version "43.18.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-43.18.0.tgz#7c412eebe362052dae811502586e1fd100c28be0"
-  integrity sha512-hAyBjYQtOFbVWt4XhUBgth/OtNg2cTQ7KMv0JSLLTnvrrrASJu0Li1ROaat81YsT+kGWytM/Fgr283ISNzy/vw==
+"@gitlab/ui@43.20.0":
+  version "43.20.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-43.20.0.tgz#f57b0ea8b01317a383695061f185acb7c92447d9"
+  integrity sha512-ck1gXmWTh6vNSpz9QzCt9Lv9Twvj+BRGkiNexICOB3j9Y6UZbTdBKANu1eiGZnM+kh0v2z3H3Cbo3f95hwywqA==
   dependencies:
     "@popperjs/core" "^2.11.2"
     bootstrap-vue "2.20.1"