From e87220d9c1a7878a4cb2bb86554c5951371e340b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Sep 2022 15:14:09 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/rails/file_path.yml             |  17 +-
 .rubocop_todo/style/case_like_if.yml          |  12 +-
 .rubocop_todo/style/empty_method.yml          |  30 ++--
 .../javascripts/blame/blame_redirect.js       |  23 +++
 app/assets/javascripts/editor/schema/ci.json  |  40 ++++-
 .../pages/projects/blame/show/index.js        |   2 +
 .../pipelines/components/pipeline_tabs.vue    |   8 +-
 app/controllers/projects/blame_controller.rb  |   3 +
 app/controllers/registrations_controller.rb   |   2 +-
 .../project_pipeline_schedules_resolver.rb    |  17 ++
 app/graphql/types/ci/job_type.rb              |  12 +-
 .../types/ci/pipeline_schedule_status_enum.rb |  12 ++
 .../types/ci/pipeline_schedule_type.rb        |  45 +++++
 .../permission_types/ci/pipeline_schedules.rb |  17 ++
 app/graphql/types/project_type.rb             |   6 +
 app/models/repository.rb                      |  42 ++---
 app/services/projects/blame_service.rb        |   8 +-
 app/views/devise/registrations/new.html.haml  |   2 +-
 app/views/projects/blame/show.html.haml       |   2 +-
 .../registrations/welcome/show.html.haml      |   4 +-
 config/feature_categories.yml                 |   2 +
 ...rge_trains.yml => license_from_gitaly.yml} |  10 +-
 db/docs/sbom_component_versions.yml           |   4 +-
 db/docs/sbom_components.yml                   |   4 +-
 db/docs/sbom_occurrences.yml                  |   4 +-
 db/docs/sbom_sources.yml                      |   4 +-
 .../sbom_vulnerable_component_versions.yml    |   4 +-
 ...4_finalize_invalid_group_member_cleanup.rb |  13 +-
 ...finalize_invalid_project_member_cleanup.rb |  13 +-
 doc/api/graphql/reference/index.md            |  78 ++++++++
 doc/api/jobs.md                               |  12 ++
 doc/ci/pipelines/multi_project_pipelines.md   |   4 +-
 doc/development/fe_guide/accessibility.md     |  80 ++++-----
 doc/user/group/epics/manage_epics.md          |  21 ++-
 doc/user/permissions.md                       |   4 +
 lib/api/entities/license.rb                   |   1 +
 lib/api/entities/license_basic.rb             |   8 +-
 lib/gitlab/batch_pop_queueing.rb              | 113 ------------
 lib/gitlab/ci/parsers/security/common.rb      |  30 +---
 lib/gitlab/git/declared_license.rb            |  38 ++++
 lib/gitlab/git/repository.rb                  |  23 ++-
 .../gitaly_client/repository_service.rb       |   6 +-
 locale/gitlab.pot                             |   9 +
 spec/controllers/projects_controller_spec.rb  |   6 +-
 .../features/projects/blobs/blob_show_spec.rb |   2 +-
 .../feature-branch/gl-sast-report.json        |   4 +-
 .../gl-common-scanning-report-names.json      |  59 +++++-
 .../master/gl-common-scanning-report.json     | 170 ++++++++++--------
 .../master/gl-sast-report-minimal.json        |   4 +-
 .../master/gl-sast-report.json                |   4 +-
 .../master/gl-secret-detection-report.json    |   3 +
 spec/frontend/blame/blame_redirect_spec.js    |  70 ++++++++
 .../components/tags/tags_list_row_spec.js     |   4 +-
 .../components/tags/tags_list_spec.js         |   4 +-
 .../harbor_registry/pages/tags_spec.js        |   4 +-
 .../repository/components/table/index_spec.js |   2 +-
 .../components/table/parent_row_spec.js       |   4 +-
 .../repository/components/table/row_spec.js   |  16 +-
 .../components/tree_content_spec.js           |   4 +-
 .../components/upload_blob_modal_spec.js      |  12 +-
 spec/frontend/repository/pages/blob_spec.js   |   2 +-
 spec/frontend/repository/pages/index_spec.js  |   2 +-
 .../admin_runners/admin_runners_app_spec.js   |   8 +-
 .../runner/components/cells/link_cell_spec.js |   2 +-
 .../cells/runner_stacked_summary_cell_spec.js |   6 +-
 .../components/runner_type_tabs_spec.js       |   2 +-
 .../components/runner_update_form_spec.js     |   2 +-
 .../components/confidentiality_filter_spec.js |   2 +-
 .../sidebar/components/radio_filter_spec.js   |   2 +-
 .../sidebar/components/status_filter_spec.js  |   2 +-
 .../search/sort/components/app_spec.js        |   6 +-
 .../search/topbar/components/app_spec.js      |   6 +-
 .../topbar/components/group_filter_spec.js    |   2 +-
 .../topbar/components/project_filter_spec.js  |   2 +-
 .../components/search_settings_spec.js        |   4 +-
 .../components/training_provider_list_spec.js |   4 +-
 .../components/self_monitor_form_spec.js      |   4 +-
 .../set_status_modal_wrapper_spec.js          |   4 +-
 spec/frontend/sidebar/assignee_title_spec.js  |   4 +-
 spec/frontend/sidebar/assignees_spec.js       |   2 +-
 .../assignees/assignee_avatar_link_spec.js    |   2 +-
 .../assignees/collapsed_assignee_list_spec.js |   2 +-
 .../assignees/collapsed_assignee_spec.js      |   2 +-
 .../uncollapsed_assignee_list_spec.js         |   2 +-
 .../copy_email_to_clipboard_spec.js           |   2 +-
 .../date/sidebar_date_widget_spec.js          |   6 +-
 .../date/sidebar_formatted_date_spec.js       |   2 +-
 .../components/severity/severity_spec.js      |   2 +-
 .../severity/sidebar_severity_spec.js         |   2 +-
 .../todo_toggle/sidebar_todo_widget_spec.js   |  12 +-
 .../sidebar/issuable_assignees_spec.js        |   2 +-
 .../sidebar/lock/issuable_lock_form_spec.js   |   2 +-
 spec/frontend/sidebar/participants_spec.js    |   6 +-
 spec/frontend/sidebar/reviewer_title_spec.js  |   4 +-
 spec/frontend/sidebar/reviewers_spec.js       |   2 +-
 .../sidebar/sidebar_assignees_spec.js         |   8 +-
 spec/frontend/sidebar/subscriptions_spec.js   |   2 +-
 spec/frontend/sidebar/todo_spec.js            |  10 +-
 .../frontend/snippets/components/edit_spec.js |   6 +-
 .../components/embed_dropdown_spec.js         |   2 +-
 .../components/snippet_blob_edit_spec.js      |   6 +-
 .../components/snippet_blob_view_spec.js      |  26 +--
 .../components/snippet_header_spec.js         |   2 +-
 .../snippets/components/snippet_title_spec.js |   8 +-
 .../snippet_visibility_edit_spec.js           |   8 +-
 spec/frontend/terms/components/app_spec.js    |   2 +-
 .../terraform/components/states_table_spec.js |   6 +-
 .../components/terraform_list_spec.js         |  14 +-
 spec/frontend/toggles/index_spec.js           |   4 +-
 .../tooltips/components/tooltips_spec.js      |  18 +-
 .../components/edit_user_list_spec.js         |   8 +-
 .../components/new_user_list_spec.js          |   2 +-
 .../user_lists/components/user_list_spec.js   |   6 +-
 .../components/user_lists_table_spec.js       |   4 +-
 .../components/approvals/approvals_spec.js    |   6 +-
 .../approvals_summary_optional_spec.js        |   2 +-
 .../approvals/approvals_summary_spec.js       |   4 +-
 .../components/artifacts_list_app_spec.js     |   2 +-
 .../components/artifacts_list_spec.js         |   4 +-
 .../mr_collapsible_extension_spec.js          |   4 +-
 .../components/mr_widget_author_time_spec.js  |   4 +-
 .../mr_widget_expandable_section_spec.js      |   6 +-
 .../components/mr_widget_icon_spec.js         |   2 +-
 .../mr_widget_pipeline_container_spec.js      |  12 +-
 .../mr_widget_suggest_pipeline_spec.js        |   4 +-
 .../mr_widget_auto_merge_failed_spec.js       |   4 +-
 .../states/mr_widget_ready_to_merge_spec.js   |   6 +-
 .../mr_widget_squash_before_merge_spec.js     |   2 +-
 .../mr_widget_terraform_container_spec.js     |   4 +-
 .../deployment_action_button_spec.js          |  20 +--
 .../deployment/deployment_spec.js             |  10 +-
 .../extensions/test_report/index_spec.js      |   2 +-
 .../mr_widget_how_to_merge_modal_spec.js      |   2 +-
 .../mr_widget_options_spec.js                 |  21 ++-
 .../components/ci_badge_link_spec.js          |   2 +-
 .../frontend/whats_new/components/app_spec.js |   6 +-
 .../work_item_links_menu_spec.js              |   4 +-
 .../components/app_spec.js                    |   4 +-
 .../components/hierarchy_spec.js              |   2 +-
 ...roject_pipeline_schedules_resolver_spec.rb |  40 +++++
 .../ci/pipeline_schedule_status_enum_spec.rb  |  11 ++
 .../types/ci/pipeline_schedule_type_spec.rb   |  30 ++++
 .../ci/pipeline_schedule_type_spec.rb         |   7 +
 spec/graphql/types/project_type_spec.rb       |   2 +-
 spec/helpers/projects_helper_spec.rb          |   2 +-
 spec/lib/gitlab/batch_pop_queueing_spec.rb    | 147 ---------------
 .../gitlab/ci/parsers/security/common_spec.rb |  86 ++++-----
 .../gitlab/ci/parsers/security/sast_spec.rb   |  69 ++++++-
 spec/lib/gitlab/git/repository_spec.rb        |  30 ++--
 ...alize_invalid_group_member_cleanup_spec.rb |  72 --------
 ...ize_invalid_project_member_cleanup_spec.rb |  72 --------
 spec/models/repository_spec.rb                |  83 +++++----
 spec/presenters/project_presenter_spec.rb     |   8 +-
 .../api/graphql/ci/pipeline_schedules_spec.rb |  88 +++++++++
 spec/requests/api/projects_spec.rb            |   2 +-
 155 files changed, 1288 insertions(+), 1021 deletions(-)
 create mode 100644 app/assets/javascripts/blame/blame_redirect.js
 create mode 100644 app/graphql/resolvers/project_pipeline_schedules_resolver.rb
 create mode 100644 app/graphql/types/ci/pipeline_schedule_status_enum.rb
 create mode 100644 app/graphql/types/ci/pipeline_schedule_type.rb
 create mode 100644 app/graphql/types/permission_types/ci/pipeline_schedules.rb
 rename config/feature_flags/development/{bypass_batch_pop_queueing_for_merge_trains.yml => license_from_gitaly.yml} (59%)
 delete mode 100644 lib/gitlab/batch_pop_queueing.rb
 create mode 100644 lib/gitlab/git/declared_license.rb
 create mode 100644 spec/frontend/blame/blame_redirect_spec.js
 create mode 100644 spec/graphql/resolvers/project_pipeline_schedules_resolver_spec.rb
 create mode 100644 spec/graphql/types/ci/pipeline_schedule_status_enum_spec.rb
 create mode 100644 spec/graphql/types/ci/pipeline_schedule_type_spec.rb
 create mode 100644 spec/graphql/types/permission_types/ci/pipeline_schedule_type_spec.rb
 delete mode 100644 spec/lib/gitlab/batch_pop_queueing_spec.rb
 delete mode 100644 spec/migrations/finalize_invalid_group_member_cleanup_spec.rb
 delete mode 100644 spec/migrations/finalize_invalid_project_member_cleanup_spec.rb
 create mode 100644 spec/requests/api/graphql/ci/pipeline_schedules_spec.rb

diff --git a/.rubocop_todo/rails/file_path.yml b/.rubocop_todo/rails/file_path.yml
index 467073eb2db..24a08fa5ee2 100644
--- a/.rubocop_todo/rails/file_path.yml
+++ b/.rubocop_todo/rails/file_path.yml
@@ -1,10 +1,7 @@
 ---
 Rails/FilePath:
-  # Offense count: 212
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
-    - 'app/controllers/clusters/clusters_controller.rb'
     - 'app/controllers/help_controller.rb'
     - 'app/helpers/startupjs_helper.rb'
     - 'app/models/clusters/applications/cert_manager.rb'
@@ -29,6 +26,7 @@ Rails/FilePath:
     - 'ee/db/fixtures/development/21_dast_profiles.rb'
     - 'ee/db/fixtures/development/32_compliance_report_violations.rb'
     - 'ee/lib/ee/feature/definition.rb'
+    - 'ee/lib/ee/gitlab/audit/type/definition.rb'
     - 'ee/lib/ee/gitlab/usage/metric_definition.rb'
     - 'ee/lib/gitlab/geo/health_check.rb'
     - 'ee/lib/tasks/gitlab/seed/metrics.rake'
@@ -48,6 +46,8 @@ Rails/FilePath:
     - 'lib/api/api.rb'
     - 'lib/error_tracking/collector/payload_validator.rb'
     - 'lib/feature/definition.rb'
+    - 'lib/gitlab/audit/type/definition.rb'
+    - 'lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator.rb'
     - 'lib/gitlab/ci/reports/codequality_reports.rb'
     - 'lib/gitlab/database/migrations/runner.rb'
     - 'lib/gitlab/favicon.rb'
@@ -69,14 +69,17 @@ Rails/FilePath:
     - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb'
     - 'lib/system_check/app/uploads_directory_exists_check.rb'
     - 'lib/system_check/incoming_email/imap_authentication_check.rb'
+    - 'lib/tasks/gitlab/db.rake'
     - 'lib/tasks/gitlab/metrics_exporter.rake'
+    - 'lib/tasks/gitlab/usage_data.rake'
     - 'lib/tasks/tanuki_emoji.rake'
     - 'metrics_server/metrics_server.rb'
     - 'spec/commands/metrics_server/metrics_server_spec.rb'
     - 'spec/config/object_store_settings_spec.rb'
-    - 'spec/controllers/help_controller_spec.rb'
+    - 'spec/db/development/add_security_training_providers_spec.rb'
     - 'spec/db/development/create_base_work_item_types_spec.rb'
     - 'spec/db/development/import_common_metrics_spec.rb'
+    - 'spec/db/production/add_security_training_providers_spec.rb'
     - 'spec/db/production/create_base_work_item_types_spec.rb'
     - 'spec/db/production/import_common_metrics_spec.rb'
     - 'spec/db/schema_spec.rb'
@@ -100,7 +103,6 @@ Rails/FilePath:
     - 'spec/features/projects/settings/repository_settings_spec.rb'
     - 'spec/features/projects/settings/user_changes_avatar_spec.rb'
     - 'spec/features/projects/snippets/create_snippet_spec.rb'
-    - 'spec/features/projects/tags/user_edits_tags_spec.rb'
     - 'spec/features/projects/tree/upload_file_spec.rb'
     - 'spec/features/snippets/user_creates_snippet_spec.rb'
     - 'spec/features/snippets/user_edits_snippet_spec.rb'
@@ -127,10 +129,12 @@ Rails/FilePath:
     - 'spec/models/clusters/applications/cert_manager_spec.rb'
     - 'spec/models/release_highlight_spec.rb'
     - 'spec/requests/api/internal/mail_room_spec.rb'
+    - 'spec/requests/api/usage_data_queries_spec.rb'
     - 'spec/serializers/review_app_setup_entity_spec.rb'
     - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
     - 'spec/services/clusters/aws/provision_service_spec.rb'
     - 'spec/services/metrics/sample_metrics_service_spec.rb'
+    - 'spec/support/helpers/doc_url_helper.rb'
     - 'spec/support/helpers/test_env.rb'
     - 'spec/support/helpers/upload_helpers.rb'
     - 'spec/support/shared_examples/features/project_upload_files_shared_examples.rb'
@@ -139,3 +143,4 @@ Rails/FilePath:
     - 'spec/support/shared_examples/models/wiki_shared_examples.rb'
     - 'spec/tasks/gitlab/db_rake_spec.rb'
     - 'spec/tasks/gitlab/generate_sample_prometheus_data_spec.rb'
+    - 'spec/tasks/gitlab/usage_data_rake_spec.rb'
diff --git a/.rubocop_todo/style/case_like_if.yml b/.rubocop_todo/style/case_like_if.yml
index 119ca3d800f..61f2e6bc238 100644
--- a/.rubocop_todo/style/case_like_if.yml
+++ b/.rubocop_todo/style/case_like_if.yml
@@ -1,9 +1,7 @@
 ---
 # Cop supports --auto-correct.
 Style/CaseLikeIf:
-  # Offense count: 60
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/controllers/concerns/issuable_actions.rb'
     - 'app/controllers/groups/dependency_proxy/application_controller.rb'
@@ -13,6 +11,7 @@ Style/CaseLikeIf:
     - 'app/helpers/broadcast_messages_helper.rb'
     - 'app/helpers/issues_helper.rb'
     - 'app/helpers/routing/pseudonymization_helper.rb'
+    - 'app/helpers/todos_helper.rb'
     - 'app/models/integrations/jira.rb'
     - 'app/models/members/member_task.rb'
     - 'app/models/namespace.rb'
@@ -21,8 +20,11 @@ Style/CaseLikeIf:
     - 'app/services/google_cloud/generate_pipeline_service.rb'
     - 'app/services/issuable/bulk_update_service.rb'
     - 'app/services/todo_service.rb'
+    - 'app/services/user_project_access_changed_service.rb'
     - 'ee/app/controllers/concerns/credentials_inventory_actions.rb'
     - 'ee/app/finders/ee/notes_finder.rb'
+    - 'ee/app/finders/security/scan_execution_policies_finder.rb'
+    - 'ee/app/finders/security/training_providers/secure_code_warrior_url_finder.rb'
     - 'ee/app/helpers/ee/branches_helper.rb'
     - 'ee/app/services/epics/tree_reorder_service.rb'
     - 'ee/app/services/merge_request_approval_settings/update_service.rb'
@@ -43,18 +45,18 @@ Style/CaseLikeIf:
     - 'lib/gitlab/utils/strong_memoize.rb'
     - 'qa/qa/git/repository.rb'
     - 'qa/qa/scenario/bootable.rb'
-    - 'rubocop/cop/gitlab/keys_first_and_values_first.rb'
     - 'spec/features/boards/user_adds_lists_to_board_spec.rb'
     - 'spec/lib/gitlab/auth/auth_finders_spec.rb'
     - 'spec/lib/gitlab/database/load_balancing_spec.rb'
     - 'spec/lib/omni_auth/strategies/jwt_spec.rb'
     - 'spec/models/concerns/sha_attribute_spec.rb'
     - 'spec/models/preloaders/labels_preloader_spec.rb'
+    - 'spec/requests/api/personal_access_tokens_spec.rb'
     - 'spec/requests/api/rubygem_packages_spec.rb'
     - 'spec/requests/api/terraform/modules/v1/packages_spec.rb'
+    - 'spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb'
     - 'spec/services/resource_events/change_state_service_spec.rb'
     - 'spec/support/helpers/filter_spec_helper.rb'
-    - 'spec/support/matchers/abort_matcher.rb'
     - 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb'
     - 'spec/support/shared_examples/requests/api/notes_shared_examples.rb'
     - 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb'
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index 3e6a1efec70..7fbec98ead5 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -1,16 +1,12 @@
 ---
 # Cop supports --auto-correct.
 Style/EmptyMethod:
-  # Offense count: 240
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/controllers/admin/application_settings/appearances_controller.rb'
     - 'app/controllers/admin/applications_controller.rb'
     - 'app/controllers/admin/broadcast_messages_controller.rb'
     - 'app/controllers/admin/deploy_keys_controller.rb'
-    - 'app/controllers/admin/hook_logs_controller.rb'
-    - 'app/controllers/admin/hooks_controller.rb'
     - 'app/controllers/admin/identities_controller.rb'
     - 'app/controllers/admin/labels_controller.rb'
     - 'app/controllers/admin/runners_controller.rb'
@@ -35,13 +31,11 @@ Style/EmptyMethod:
     - 'app/controllers/projects/alert_management_controller.rb'
     - 'app/controllers/projects/ci/lints_controller.rb'
     - 'app/controllers/projects/ci/pipeline_editor_controller.rb'
-    - 'app/controllers/projects/ci/secure_files_controller.rb'
     - 'app/controllers/projects/confluences_controller.rb'
     - 'app/controllers/projects/deploy_keys_controller.rb'
     - 'app/controllers/projects/environments_controller.rb'
     - 'app/controllers/projects/feature_flags_controller.rb'
     - 'app/controllers/projects/feature_flags_user_lists_controller.rb'
-    - 'app/controllers/projects/hook_logs_controller.rb'
     - 'app/controllers/projects/import/jira_controller.rb'
     - 'app/controllers/projects/imports_controller.rb'
     - 'app/controllers/projects/incidents_controller.rb'
@@ -55,30 +49,32 @@ Style/EmptyMethod:
     - 'app/controllers/projects/runners_controller.rb'
     - 'app/controllers/projects/settings/integrations_controller.rb'
     - 'app/controllers/projects/settings/packages_and_registries_controller.rb'
-    - 'app/controllers/projects/tags/releases_controller.rb'
     - 'app/controllers/projects/terraform_controller.rb'
     - 'app/controllers/projects/triggers_controller.rb'
+    - 'app/controllers/pwa_controller.rb'
     - 'app/controllers/registrations/welcome_controller.rb'
     - 'app/controllers/search_controller.rb'
+    - 'app/experiments/security_actions_continuous_onboarding_experiment.rb'
     - 'app/graphql/resolvers/concerns/caching_array_resolver.rb'
     - 'app/helpers/subscribable_banner_helper.rb'
     - 'app/helpers/users/callouts_helper.rb'
     - 'app/models/ci/bridge.rb'
+    - 'app/models/ci/job_artifact.rb'
     - 'app/models/concerns/cross_database_modification.rb'
     - 'app/models/concerns/reactive_caching.rb'
     - 'app/models/concerns/relative_positioning.rb'
     - 'app/models/hooks/web_hook.rb'
     - 'app/models/integrations/hangouts_chat.rb'
     - 'app/models/integrations/microsoft_teams.rb'
+    - 'app/models/integrations/pumble.rb'
     - 'app/models/integrations/unify_circuit.rb'
     - 'app/models/integrations/webex_teams.rb'
     - 'app/models/wiki.rb'
     - 'app/services/auto_merge/base_service.rb'
     - 'app/services/award_emojis/destroy_service.rb'
+    - 'app/services/groups/transfer_service.rb'
     - 'app/services/issuable_base_service.rb'
-    - 'app/services/issues/reopen_service.rb'
     - 'app/services/projects/transfer_service.rb'
-    - 'app/workers/authorized_projects_worker.rb'
     - 'app/workers/namespaces/root_statistics_worker.rb'
     - 'db/migrate/20210420012444_change_web_hook_events_default.rb'
     - 'db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb'
@@ -92,6 +88,7 @@ Style/EmptyMethod:
     - 'db/post_migrate/20220324032250_migrate_shimo_confluence_service_category.rb'
     - 'db/post_migrate/20220412143552_consume_remaining_encrypt_integration_property_jobs.rb'
     - 'db/post_migrate/20220425121435_backfill_integrations_enable_ssl_verification.rb'
+    - 'db/post_migrate/20220524074947_finalize_backfill_null_note_discussion_ids.rb'
     - 'ee/app/controllers/admin/emails_controller.rb'
     - 'ee/app/controllers/admin/geo/designs_controller.rb'
     - 'ee/app/controllers/admin/geo/settings_controller.rb'
@@ -101,9 +98,8 @@ Style/EmptyMethod:
     - 'ee/app/controllers/groups/analytics/devops_adoption_controller.rb'
     - 'ee/app/controllers/groups/compliance_frameworks_controller.rb'
     - 'ee/app/controllers/groups/feature_discovery_moments_controller.rb'
-    - 'ee/app/controllers/groups/hooks_controller.rb'
     - 'ee/app/controllers/groups/ldap_group_links_controller.rb'
-    - 'ee/app/controllers/groups/push_rules_controller.rb'
+    - 'ee/app/controllers/groups/settings/reporting_controller.rb'
     - 'ee/app/controllers/projects/analytics/code_reviews_controller.rb'
     - 'ee/app/controllers/projects/analytics/merge_request_analytics_controller.rb'
     - 'ee/app/controllers/projects/incident_management/escalation_policies_controller.rb'
@@ -122,8 +118,10 @@ Style/EmptyMethod:
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/controllers/trial_registrations_controller.rb'
     - 'ee/app/controllers/trials_controller.rb'
+    - 'ee/app/controllers/users/identity_verification_controller.rb'
     - 'ee/app/experiments/cart_abandonment_modal_experiment.rb'
     - 'ee/app/models/ee/epic.rb'
+    - 'ee/app/models/geo/group_wiki_repository_registry.rb'
     - 'ee/app/services/feature_flag_issues/destroy_service.rb'
     - 'ee/db/geo/migrate/20170906174622_remove_duplicates_from_project_registry.rb'
     - 'lib/api/helpers/packages/conan/api_helpers.rb'
@@ -135,6 +133,8 @@ Style/EmptyMethod:
     - 'lib/gitlab/alert_management/payload/base.rb'
     - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb'
     - 'lib/gitlab/background_migration/create_security_setting.rb'
+    - 'lib/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb'
+    - 'lib/gitlab/background_migration/delete_invalid_epic_issues.rb'
     - 'lib/gitlab/background_migration/drop_invalid_remediations.rb'
     - 'lib/gitlab/background_migration/fix_incorrect_max_seats_used.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
@@ -142,6 +142,7 @@ Style/EmptyMethod:
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb'
     - 'lib/gitlab/background_migration/migrate_job_artifact_registry_to_ssf.rb'
     - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb'
+    - 'lib/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb'
     - 'lib/gitlab/background_migration/recalculate_vulnerability_finding_signatures_for_findings.rb'
     - 'lib/gitlab/background_migration/update_vulnerability_occurrences_location.rb'
     - 'lib/gitlab/ci/config/entry/need.rb'
@@ -150,10 +151,10 @@ Style/EmptyMethod:
     - 'lib/gitlab/ci/pipeline/chain/validate/after_config.rb'
     - 'lib/gitlab/config/entry/node.rb'
     - 'lib/gitlab/config/entry/simplifiable.rb'
-    - 'lib/gitlab/email/message/in_product_marketing/experience.rb'
     - 'lib/gitlab/empty_search_results.rb'
     - 'lib/gitlab/git_access.rb'
     - 'lib/gitlab/import_export/json/ndjson_writer.rb'
+    - 'lib/gitlab/mailgun/webhook_processors/base.rb'
     - 'lib/gitlab/null_request_store.rb'
     - 'lib/gitlab/usage_data_non_sql_metrics.rb'
     - 'lib/mattermost/session.rb'
@@ -162,7 +163,6 @@ Style/EmptyMethod:
     - 'qa/qa/resource/job.rb'
     - 'qa/qa/resource/package.rb'
     - 'qa/qa/resource/registry_repository.rb'
-    - 'qa/qa/resource/runner.rb'
     - 'qa/qa/service/cluster_provider/k3d.rb'
     - 'qa/qa/service/cluster_provider/k3s.rb'
     - 'qa/qa/service/cluster_provider/minikube.rb'
@@ -173,7 +173,6 @@ Style/EmptyMethod:
     - 'spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb'
     - 'spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb'
     - 'spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb'
-    - 'spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb'
     - 'spec/lib/gitlab/database/partitioning/sliding_list_strategy_spec.rb'
     - 'spec/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin_spec.rb'
     - 'spec/lib/gitlab/database/postgresql_database_tasks/load_schema_versions_mixin_spec.rb'
@@ -192,4 +191,5 @@ Style/EmptyMethod:
     - 'spec/lib/gitlab/utils/delegator_override/validator_spec.rb'
     - 'spec/lib/gitlab/utils/delegator_override_spec.rb'
     - 'spec/lib/gitlab/utils/override_spec.rb'
+    - 'spec/lib/gitlab/utils/strong_memoize_spec.rb'
     - 'spec/workers/concerns/waitable_worker_spec.rb'
diff --git a/app/assets/javascripts/blame/blame_redirect.js b/app/assets/javascripts/blame/blame_redirect.js
new file mode 100644
index 00000000000..155e2a3a2cd
--- /dev/null
+++ b/app/assets/javascripts/blame/blame_redirect.js
@@ -0,0 +1,23 @@
+import { setUrlParams } from '~/lib/utils/url_utility';
+import { createAlert } from '~/flash';
+import { __ } from '~/locale';
+
+export default function redirectToCorrectBlamePage() {
+  const { hash } = window.location;
+  const linesPerPage = parseInt(document.querySelector('.js-per-page').dataset.perPage, 10);
+  const params = new URLSearchParams(window.location.search);
+  const currentPage = parseInt(params.get('page'), 10);
+  const isPaginationDisabled = params.get('no_pagination');
+  if (hash && linesPerPage && !isPaginationDisabled) {
+    const lineNumber = parseInt(hash.split('#L')[1], 10);
+    const pageToRedirect = Math.ceil(lineNumber / linesPerPage);
+    const isRedirectNeeded =
+      (pageToRedirect > 1 && pageToRedirect !== currentPage) || pageToRedirect < currentPage;
+    if (isRedirectNeeded) {
+      createAlert({
+        message: __('Please wait a few moments while we load the file history for this line.'),
+      });
+      window.location.href = setUrlParams({ page: pageToRedirect });
+    }
+  }
+}
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
index 848ba7dbeef..3b9d87134fd 100644
--- a/app/assets/javascripts/editor/schema/ci.json
+++ b/app/assets/javascripts/editor/schema/ci.json
@@ -1,7 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://gitlab.com/.gitlab-ci.yml",
-  "title": "Gitlab CI configuration",
   "markdownDescription": "Gitlab has a built-in solution for doing CI called Gitlab CI. It is configured by supplying a file called `.gitlab-ci.yml`, which will list all the jobs that are going to run for the project. A full list of all options can be found [here](https://docs.gitlab.com/ee/ci/yaml). [Learn More](https://docs.gitlab.com/ee/ci/index.html).",
   "type": "object",
   "properties": {
@@ -408,6 +407,13 @@
             }
           },
           "required": ["name"]
+        },
+        {
+          "type": "array",
+          "minLength": 1,
+          "items": {
+            "type": "string"
+          }
         }
       ],
       "markdownDescription": "Specifies the docker image to use for the job or globally for all jobs. Job configuration takes precedence over global setting. Requires a certain kind of Gitlab runner executor. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#image)."
@@ -1047,10 +1053,21 @@
           ]
         },
         "stage": {
-          "type": "string",
           "description": "Define what stage the job will run in.",
-          "minLength": 1
-        },
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
+            },
+            {
+              "type": "array",
+              "minLength": 1,
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
+          },
         "only": {
           "$ref": "#/definitions/filter",
           "description": "Job will run *only* when these filtering options match."
@@ -1583,9 +1600,22 @@
     },
     "tags": {
       "type": "array",
+      "minLength": 1,
       "markdownDescription": "Used to select runners from the list of available runners. A runner must have all tags listed here to run the job. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#tags).",
       "items": {
-        "type": "string"
+        "anyOf": [
+          {
+            "type": "string",
+            "minLength": 1
+          },
+          {
+            "type": "array",
+            "minLength": 1,
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
       }
     }
   }
diff --git a/app/assets/javascripts/pages/projects/blame/show/index.js b/app/assets/javascripts/pages/projects/blame/show/index.js
index fa22c11d1d7..1e4b9de90f2 100644
--- a/app/assets/javascripts/pages/projects/blame/show/index.js
+++ b/app/assets/javascripts/pages/projects/blame/show/index.js
@@ -1,3 +1,5 @@
 import initBlob from '~/pages/projects/init_blob';
+import redirectToCorrectPage from '~/blame/blame_redirect';
 
+redirectToCorrectPage();
 initBlob();
diff --git a/app/assets/javascripts/pipelines/components/pipeline_tabs.vue b/app/assets/javascripts/pipelines/components/pipeline_tabs.vue
index df59962569e..2a78636261b 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_tabs.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_tabs.vue
@@ -56,7 +56,12 @@ export default {
 
 <template>
   <gl-tabs>
-    <gl-tab ref="pipelineTab" :title="$options.i18n.tabs.pipelineTitle" data-testid="pipeline-tab">
+    <gl-tab
+      ref="pipelineTab"
+      :title="$options.i18n.tabs.pipelineTitle"
+      data-testid="pipeline-tab"
+      lazy
+    >
       <pipeline-graph-wrapper />
     </gl-tab>
     <gl-tab
@@ -64,6 +69,7 @@ export default {
       :title="$options.i18n.tabs.needsTitle"
       :active="isActive($options.tabNames.needs)"
       data-testid="dag-tab"
+      lazy
     >
       <dag />
     </gl-tab>
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index 2a20c67a23d..01ed5473b41 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -26,7 +26,10 @@ class Projects::BlameController < Projects::ApplicationController
     blame_service = Projects::BlameService.new(@blob, @commit, params.permit(:page, :no_pagination))
 
     @blame = Gitlab::View::Presenter::Factory.new(blame_service.blame, project: @project, path: @path, page: blame_service.page).fabricate!
+
     @blame_pagination = blame_service.pagination
+
+    @blame_per_page = blame_service.per_page
   end
 end
 
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index afe9af4a207..0bd266bb490 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -114,7 +114,7 @@ class RegistrationsController < Devise::RegistrationsController
   def after_sign_up_path_for(user)
     Gitlab::AppLogger.info(user_created_message(confirmed: user.confirmed?))
 
-    users_sign_up_welcome_path(request.query_parameters.slice(:glm_source, :glm_content))
+    users_sign_up_welcome_path
   end
 
   def after_inactive_sign_up_path_for(resource)
diff --git a/app/graphql/resolvers/project_pipeline_schedules_resolver.rb b/app/graphql/resolvers/project_pipeline_schedules_resolver.rb
new file mode 100644
index 00000000000..eb980f72717
--- /dev/null
+++ b/app/graphql/resolvers/project_pipeline_schedules_resolver.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Resolvers
+  class ProjectPipelineSchedulesResolver < BaseResolver
+    alias_method :project, :object
+
+    type ::Types::Ci::PipelineScheduleType.connection_type, null: true
+
+    argument :status, ::Types::Ci::PipelineScheduleStatusEnum,
+             required: false,
+             description: 'Filter pipeline schedules by active status.'
+
+    def resolve(status: nil)
+      ::Ci::PipelineSchedulesFinder.new(project).execute(scope: status)
+    end
+  end
+end
diff --git a/app/graphql/types/ci/job_type.rb b/app/graphql/types/ci/job_type.rb
index ab6103d9469..8da6532dcd8 100644
--- a/app/graphql/types/ci/job_type.rb
+++ b/app/graphql/types/ci/job_type.rb
@@ -148,17 +148,7 @@ module Types
       end
 
       def stage
-        ::Gitlab::Graphql::Lazy.with_value(pipeline) do |pl|
-          BatchLoader::GraphQL.for([pl, object.stage]).batch do |ids, loader|
-            by_pipeline = ids
-              .group_by(&:first)
-              .transform_values { |grp| grp.map(&:second) }
-
-            by_pipeline.each do |p, names|
-              p.stages.by_name(names).each { |s| loader.call([p, s.name], s) }
-            end
-          end
-        end
+        ::Gitlab::Graphql::Loaders::BatchModelLoader.new(::Ci::Stage, object.stage_id).find
       end
 
       # This class is a secret union!
diff --git a/app/graphql/types/ci/pipeline_schedule_status_enum.rb b/app/graphql/types/ci/pipeline_schedule_status_enum.rb
new file mode 100644
index 00000000000..61bae7daff8
--- /dev/null
+++ b/app/graphql/types/ci/pipeline_schedule_status_enum.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Types
+  module Ci
+    class PipelineScheduleStatusEnum < BaseEnum
+      graphql_name 'PipelineScheduleStatus'
+
+      value 'ACTIVE', value: "active", description: 'Active pipeline schedules.'
+      value 'INACTIVE', value: "inactive", description: 'Inactive pipeline schedules.'
+    end
+  end
+end
diff --git a/app/graphql/types/ci/pipeline_schedule_type.rb b/app/graphql/types/ci/pipeline_schedule_type.rb
new file mode 100644
index 00000000000..04f9fc78a92
--- /dev/null
+++ b/app/graphql/types/ci/pipeline_schedule_type.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Types
+  module Ci
+    class PipelineScheduleType < BaseObject
+      graphql_name 'PipelineSchedule'
+
+      connection_type_class(Types::CountableConnectionType)
+
+      expose_permissions Types::PermissionTypes::Ci::PipelineSchedules
+
+      authorize :read_pipeline_schedule
+
+      field :id, GraphQL::Types::ID, null: false, description: 'ID of the pipeline schedule.'
+
+      field :description, GraphQL::Types::String, null: true, description: 'Description of the pipeline schedule.'
+
+      field :owner, ::Types::UserType, null: false, description: 'Owner of the pipeline schedule.'
+
+      field :active, GraphQL::Types::Boolean, null: false, description: 'Indicates if a pipeline schedule is active.'
+
+      field :next_run_at, Types::TimeType, null: false, description: 'Time when the next pipeline will run.'
+
+      field :real_next_run, Types::TimeType, null: false, description: 'Time when the next pipeline will run.'
+
+      field :last_pipeline, PipelineType, null: true, description: 'Last pipeline object.'
+
+      field :ref_for_display, GraphQL::Types::String,
+            null: true, description: 'Git ref for the pipeline schedule.', method: :ref_for_display
+
+      field :ref_path, GraphQL::Types::String, null: true, description: 'Path to the ref that triggered the pipeline.'
+
+      field :for_tag, GraphQL::Types::Boolean,
+            null: false, description: 'Indicates if a pipelines schedule belongs to a tag.', method: :for_tag?
+
+      field :cron, GraphQL::Types::String, null: false, description: 'Cron notation for the schedule.'
+
+      field :cron_timezone, GraphQL::Types::String, null: false, description: 'Timezone for the pipeline schedule.'
+
+      def ref_path
+        ::Gitlab::Routing.url_helpers.project_commits_path(object.project, object.ref_for_display)
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/permission_types/ci/pipeline_schedules.rb b/app/graphql/types/permission_types/ci/pipeline_schedules.rb
new file mode 100644
index 00000000000..268ac6096d0
--- /dev/null
+++ b/app/graphql/types/permission_types/ci/pipeline_schedules.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Types
+  module PermissionTypes
+    module Ci
+      class PipelineSchedules < BasePermissionType
+        graphql_name 'PipelineSchedulePermissions'
+
+        abilities :take_ownership_pipeline_schedule,
+                  :update_pipeline_schedule,
+                  :admin_pipeline_schedule
+
+        ability_field :play_pipeline_schedule, calls_gitaly: true
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index f43f5c27dac..a41af34ef4c 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -309,6 +309,12 @@ module Types
           extras: [:lookahead],
           resolver: Resolvers::ProjectPipelinesResolver
 
+    field :pipeline_schedules,
+            type: Types::Ci::PipelineScheduleType.connection_type,
+            null: true,
+            description: 'Pipeline schedules of the project. This field can only be resolved for one project per request.',
+            resolver: Resolvers::ProjectPipelineSchedulesResolver
+
     field :pipeline, Types::Ci::PipelineType,
           null: true,
           description: 'Build pipeline of the project.',
diff --git a/app/models/repository.rb b/app/models/repository.rb
index ee1bea0e8d2..81f1c385bf3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -48,22 +48,19 @@ class Repository
   # For example, for entry `:commit_count` there's a method called `commit_count` which
   # stores its data in the `commit_count` cache key.
   CACHED_METHODS = %i(size commit_count readme_path contribution_guide
-                      changelog license_blob license_key gitignore
+                      changelog license_blob license_licensee license_gitaly gitignore
                       gitlab_ci_yml branch_names tag_names branch_count
                       tag_count avatar exists? root_ref merged_branch_names
                       has_visible_content? issue_template_names_hash merge_request_template_names_hash
                       user_defined_metrics_dashboard_paths xcode_project? has_ambiguous_refs?).freeze
 
-  # Methods that use cache_method but only memoize the value
-  MEMOIZED_CACHED_METHODS = %i(license).freeze
-
   # Certain method caches should be refreshed when certain types of files are
   # changed. This Hash maps file types (as returned by Gitlab::FileDetector) to
   # the corresponding methods to call for refreshing caches.
   METHOD_CACHES_FOR_FILE_TYPES = {
     readme: %i(readme_path),
     changelog: :changelog,
-    license: %i(license_blob license_key license),
+    license: %i(license_blob license_licensee license_gitaly),
     contributing: :contribution_guide,
     gitignore: :gitignore,
     gitlab_ci: :gitlab_ci_yml,
@@ -650,25 +647,30 @@ class Repository
   cache_method :license_blob
 
   def license_key
-    return unless exists?
-
-    raw_repository.license_short_name
+    license&.key
   end
-  cache_method :license_key
 
   def license
-    return unless license_key
-
-    licensee_object = Licensee::License.new(license_key)
-
-    return if licensee_object.name.blank?
-
-    licensee_object
-  rescue Licensee::InvalidLicense => e
-    Gitlab::ErrorTracking.track_exception(e)
-    nil
+    if Feature.enabled?(:license_from_gitaly)
+      license_gitaly
+    else
+      license_licensee
+    end
   end
-  memoize_method :license
+
+  def license_licensee
+    return unless exists?
+
+    raw_repository.license(false)
+  end
+  cache_method :license_licensee
+
+  def license_gitaly
+    return unless exists?
+
+    raw_repository.license(true)
+  end
+  cache_method :license_gitaly
 
   def gitignore
     file_on_head(:gitignore)
diff --git a/app/services/projects/blame_service.rb b/app/services/projects/blame_service.rb
index 57b913b04e6..58e146e5a32 100644
--- a/app/services/projects/blame_service.rb
+++ b/app/services/projects/blame_service.rb
@@ -27,6 +27,10 @@ module Projects
         .page(page)
     end
 
+    def per_page
+      PER_PAGE
+    end
+
     private
 
     attr_reader :blob, :commit, :pagination_enabled
@@ -48,10 +52,6 @@ module Projects
       page
     end
 
-    def per_page
-      PER_PAGE
-    end
-
     def pagination_state(params)
       return false if Gitlab::Utils.to_boolean(params[:no_pagination], default: false)
 
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index e034a874488..b6719834358 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -9,7 +9,7 @@
 
 .signup-page
   = render 'devise/shared/signup_box',
-    url: registration_path(resource_name, request.query_parameters.slice(:glm_source, :glm_content)),
+    url: registration_path(resource_name),
     button_text: _('Register'),
     borderless: Feature.enabled?(:restyle_login_page, @project),
     show_omniauth_providers: omniauth_enabled? && button_based_providers_enabled?
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 4aa2c915200..dd041377b49 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,7 +1,7 @@
 - page_title _("Blame"), @blob.path, @ref
 - add_page_specific_style 'page_bundles/tree'
 
-#blob-content-holder.tree-holder{ data: { testid: 'blob-content-holder' } }
+#blob-content-holder.tree-holder.js-per-page{ data: { testid: 'blob-content-holder', per_page: @blame_per_page } }
   = render "projects/blob/breadcrumb", blob: @blob, blame: true
 
   .file-holder.gl-overflow-hidden
diff --git a/app/views/registrations/welcome/show.html.haml b/app/views/registrations/welcome/show.html.haml
index 48b94fa612d..911ba5e8042 100644
--- a/app/views/registrations/welcome/show.html.haml
+++ b/app/views/registrations/welcome/show.html.haml
@@ -17,9 +17,7 @@
         %p.gl-text-center= html_escape(_('%{gitlab_experience_text}. We won\'t share this information with anyone.')) % { gitlab_experience_text: gitlab_experience_text }
       - else
         %p.gl-text-center= html_escape(_('%{gitlab_experience_text}. Don\'t worry, this information isn\'t shared outside of your self-managed GitLab instance.')) % { gitlab_experience_text: gitlab_experience_text }
-      = gitlab_ui_form_for(current_user,
-        url: users_sign_up_welcome_path(request.query_parameters.slice(:glm_source, :glm_content)),
-        html: { class: 'card gl-w-full! gl-p-5 js-users-signup-welcome', 'aria-live' => 'assertive' }) do |f|
+      = gitlab_ui_form_for(current_user, url: users_sign_up_welcome_path, html: { class: 'card gl-w-full! gl-p-5 js-users-signup-welcome', 'aria-live' => 'assertive' }) do |f|
         .devise-errors
           = render 'devise/shared/error_messages', resource: current_user
         .row
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index ca27ece9196..3da46257cd0 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -10,6 +10,7 @@
 - advanced_deployments
 - advisory_database
 - api_security
+- application_instrumentation
 - application_performance
 - attack_emulation
 - audit_events
@@ -38,6 +39,7 @@
 - dedicated
 - delivery
 - dependency_firewall
+- dependency_management
 - dependency_proxy
 - dependency_scanning
 - deployment_management
diff --git a/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml b/config/feature_flags/development/license_from_gitaly.yml
similarity index 59%
rename from config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
rename to config/feature_flags/development/license_from_gitaly.yml
index 4517bd5360e..ad79d56a8ab 100644
--- a/config/feature_flags/development/bypass_batch_pop_queueing_for_merge_trains.yml
+++ b/config/feature_flags/development/license_from_gitaly.yml
@@ -1,8 +1,8 @@
 ---
-name: bypass_batch_pop_queueing_for_merge_trains
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96793
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372366
-milestone: '15.4'
+name: license_from_gitaly
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77041
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374300
+milestone: '15.5'
 type: development
-group: group::scalability
+group: group::gitaly
 default_enabled: false
diff --git a/db/docs/sbom_component_versions.yml b/db/docs/sbom_component_versions.yml
index 7fb9b7fcec5..1bee0ddb3fb 100644
--- a/db/docs/sbom_component_versions.yml
+++ b/db/docs/sbom_component_versions.yml
@@ -3,9 +3,7 @@ table_name: sbom_component_versions
 classes:
 - Sbom::ComponentVersion
 feature_categories:
-- container_scanning
-- dependency_scanning
-- license_compliance
+- dependency_management
 description: Stores version information for software components produced by a Software Bill of Materials (SBoM)
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90809
 milestone: '15.2'
diff --git a/db/docs/sbom_components.yml b/db/docs/sbom_components.yml
index 8860c253cd5..0bb1a4d7b30 100644
--- a/db/docs/sbom_components.yml
+++ b/db/docs/sbom_components.yml
@@ -3,9 +3,7 @@ table_name: sbom_components
 classes:
 - Sbom::Component
 feature_categories:
-- container_scanning
-- dependency_scanning
-- license_compliance
+- dependency_management
 description: Stores information about software components produced by a Software Bill of Materials (SBoM)
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90809
 milestone: '15.2'
diff --git a/db/docs/sbom_occurrences.yml b/db/docs/sbom_occurrences.yml
index 82d9e21aa42..b30bac79698 100644
--- a/db/docs/sbom_occurrences.yml
+++ b/db/docs/sbom_occurrences.yml
@@ -3,9 +3,7 @@ table_name: sbom_occurrences
 classes:
 - Sbom::Occurrence
 feature_categories:
-- container_scanning
-- dependency_scanning
-- license_compliance
+- dependency_management
 description: Tracks each occurrence of an SBoM component
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90814
 milestone: '15.2'
diff --git a/db/docs/sbom_sources.yml b/db/docs/sbom_sources.yml
index 514386536da..dd17b02a3dd 100644
--- a/db/docs/sbom_sources.yml
+++ b/db/docs/sbom_sources.yml
@@ -3,9 +3,7 @@ table_name: sbom_sources
 classes:
 - Sbom::Source
 feature_categories:
-- container_scanning
-- dependency_scanning
-- license_compliance
+- dependency_management
 description: Stores information about where an SBoM component originated from
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90812
 milestone: '15.2'
diff --git a/db/docs/sbom_vulnerable_component_versions.yml b/db/docs/sbom_vulnerable_component_versions.yml
index 147af9c046b..bb67c6e4f68 100644
--- a/db/docs/sbom_vulnerable_component_versions.yml
+++ b/db/docs/sbom_vulnerable_component_versions.yml
@@ -3,9 +3,7 @@ table_name: sbom_vulnerable_component_versions
 classes:
 - Sbom::VulnerableComponentVersion
 feature_categories:
-- container_scanning
-- dependency_scanning
-- license_compliance
+- dependency_management
 description: Stores information about vulnerable SBoM components
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95622
 milestone: '15.4'
diff --git a/db/migrate/20220913082824_finalize_invalid_group_member_cleanup.rb b/db/migrate/20220913082824_finalize_invalid_group_member_cleanup.rb
index 2a6dfeb4767..d5fb04f3fa3 100644
--- a/db/migrate/20220913082824_finalize_invalid_group_member_cleanup.rb
+++ b/db/migrate/20220913082824_finalize_invalid_group_member_cleanup.rb
@@ -5,15 +5,12 @@ class FinalizeInvalidGroupMemberCleanup < Gitlab::Database::Migration[2.0]
 
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
-  MIGRATION = 'DestroyInvalidGroupMembers'
-
   def up
-    ensure_batched_background_migration_is_finished(
-      job_class_name: MIGRATION,
-      table_name: :members,
-      column_name: :id,
-      job_arguments: []
-    )
+    # noop: this fails because the cleanup invalid members migration(ScheduleDestroyInvalidGroupMembers)
+    # cannot succeed, so we need to cleanup that first.
+    #
+    # issue with some details: https://gitlab.com/gitlab-org/gitlab/-/issues/365028#note_1107166816
+    # # incident: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/7779
   end
 
   def down
diff --git a/db/migrate/20220914070927_finalize_invalid_project_member_cleanup.rb b/db/migrate/20220914070927_finalize_invalid_project_member_cleanup.rb
index a58a2c3c762..30f6519ed0f 100644
--- a/db/migrate/20220914070927_finalize_invalid_project_member_cleanup.rb
+++ b/db/migrate/20220914070927_finalize_invalid_project_member_cleanup.rb
@@ -5,15 +5,12 @@ class FinalizeInvalidProjectMemberCleanup < Gitlab::Database::Migration[2.0]
 
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
-  MIGRATION = 'DestroyInvalidProjectMembers'
-
   def up
-    ensure_batched_background_migration_is_finished(
-      job_class_name: MIGRATION,
-      table_name: :members,
-      column_name: :id,
-      job_arguments: []
-    )
+    # noop: this fails because the cleanup invalid members migration(ScheduleDestroyInvalidProjectMembers)
+    # cannot succeed, so we need to cleanup that first.
+    #
+    # issue with some details: https://gitlab.com/gitlab-org/gitlab/-/issues/365028#note_1107166816
+    # # incident: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/7779
   end
 
   def down
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 80450f3b6a2..731947a8458 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -8352,6 +8352,30 @@ The edge type for [`Pipeline`](#pipeline).
 | <a id="pipelineedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
 | <a id="pipelineedgenode"></a>`node` | [`Pipeline`](#pipeline) | The item at the end of the edge. |
 
+#### `PipelineScheduleConnection`
+
+The connection type for [`PipelineSchedule`](#pipelineschedule).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="pipelinescheduleconnectioncount"></a>`count` | [`Int!`](#int) | Total count of collection. |
+| <a id="pipelinescheduleconnectionedges"></a>`edges` | [`[PipelineScheduleEdge]`](#pipelinescheduleedge) | A list of edges. |
+| <a id="pipelinescheduleconnectionnodes"></a>`nodes` | [`[PipelineSchedule]`](#pipelineschedule) | A list of nodes. |
+| <a id="pipelinescheduleconnectionpageinfo"></a>`pageInfo` | [`PageInfo!`](#pageinfo) | Information to aid in pagination. |
+
+#### `PipelineScheduleEdge`
+
+The edge type for [`PipelineSchedule`](#pipelineschedule).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="pipelinescheduleedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
+| <a id="pipelinescheduleedgenode"></a>`node` | [`PipelineSchedule`](#pipelineschedule) | The item at the end of the edge. |
+
 #### `PipelineSecurityReportFindingConnection`
 
 The connection type for [`PipelineSecurityReportFinding`](#pipelinesecurityreportfinding).
@@ -15892,6 +15916,37 @@ Represents pipeline counts for the project.
 | <a id="pipelinepermissionsdestroypipeline"></a>`destroyPipeline` | [`Boolean!`](#boolean) | Indicates the user can perform `destroy_pipeline` on this resource. |
 | <a id="pipelinepermissionsupdatepipeline"></a>`updatePipeline` | [`Boolean!`](#boolean) | Indicates the user can perform `update_pipeline` on this resource. |
 
+### `PipelineSchedule`
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="pipelinescheduleactive"></a>`active` | [`Boolean!`](#boolean) | Indicates if a pipeline schedule is active. |
+| <a id="pipelineschedulecron"></a>`cron` | [`String!`](#string) | Cron notation for the schedule. |
+| <a id="pipelineschedulecrontimezone"></a>`cronTimezone` | [`String!`](#string) | Timezone for the pipeline schedule. |
+| <a id="pipelinescheduledescription"></a>`description` | [`String`](#string) | Description of the pipeline schedule. |
+| <a id="pipelineschedulefortag"></a>`forTag` | [`Boolean!`](#boolean) | Indicates if a pipelines schedule belongs to a tag. |
+| <a id="pipelinescheduleid"></a>`id` | [`ID!`](#id) | ID of the pipeline schedule. |
+| <a id="pipelineschedulelastpipeline"></a>`lastPipeline` | [`Pipeline`](#pipeline) | Last pipeline object. |
+| <a id="pipelineschedulenextrunat"></a>`nextRunAt` | [`Time!`](#time) | Time when the next pipeline will run. |
+| <a id="pipelinescheduleowner"></a>`owner` | [`UserCore!`](#usercore) | Owner of the pipeline schedule. |
+| <a id="pipelineschedulerealnextrun"></a>`realNextRun` | [`Time!`](#time) | Time when the next pipeline will run. |
+| <a id="pipelineschedulereffordisplay"></a>`refForDisplay` | [`String`](#string) | Git ref for the pipeline schedule. |
+| <a id="pipelineschedulerefpath"></a>`refPath` | [`String`](#string) | Path to the ref that triggered the pipeline. |
+| <a id="pipelinescheduleuserpermissions"></a>`userPermissions` | [`PipelineSchedulePermissions!`](#pipelineschedulepermissions) | Permissions for the current user on the resource. |
+
+### `PipelineSchedulePermissions`
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="pipelineschedulepermissionsadminpipelineschedule"></a>`adminPipelineSchedule` | [`Boolean!`](#boolean) | Indicates the user can perform `admin_pipeline_schedule` on this resource. |
+| <a id="pipelineschedulepermissionsplaypipelineschedule"></a>`playPipelineSchedule` | [`Boolean!`](#boolean) | Indicates the user can perform `play_pipeline_schedule` on this resource. |
+| <a id="pipelineschedulepermissionstakeownershippipelineschedule"></a>`takeOwnershipPipelineSchedule` | [`Boolean!`](#boolean) | Indicates the user can perform `take_ownership_pipeline_schedule` on this resource. |
+| <a id="pipelineschedulepermissionsupdatepipelineschedule"></a>`updatePipelineSchedule` | [`Boolean!`](#boolean) | Indicates the user can perform `update_pipeline_schedule` on this resource. |
+
 ### `PipelineSecurityReportFinding`
 
 Represents vulnerability finding of a security report on the pipeline.
@@ -16774,6 +16829,22 @@ Returns [`PipelineCounts`](#pipelinecounts).
 | <a id="projectpipelinecountssha"></a>`sha` | [`String`](#string) | Filter pipelines by the SHA of the commit they are run for. |
 | <a id="projectpipelinecountssource"></a>`source` | [`String`](#string) | Filter pipelines by their source. |
 
+##### `Project.pipelineSchedules`
+
+Pipeline schedules of the project. This field can only be resolved for one project per request.
+
+Returns [`PipelineScheduleConnection`](#pipelinescheduleconnection).
+
+This field returns a [connection](#connections). It accepts the
+four standard [pagination arguments](#connection-pagination-arguments):
+`before: String`, `after: String`, `first: Int`, `last: Int`.
+
+###### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="projectpipelineschedulesstatus"></a>`status` | [`PipelineScheduleStatus`](#pipelineschedulestatus) | Filter pipeline schedules by active status. |
+
 ##### `Project.pipelines`
 
 Build pipelines of the project.
@@ -20942,6 +21013,13 @@ Event type of the pipeline associated with a merge request.
 | <a id="pipelinemergerequesteventtypemerged_result"></a>`MERGED_RESULT` | Pipeline run on the changes from the source branch combined with the target branch. |
 | <a id="pipelinemergerequesteventtypemerge_train"></a>`MERGE_TRAIN` | Pipeline ran as part of a merge train. |
 
+### `PipelineScheduleStatus`
+
+| Value | Description |
+| ----- | ----------- |
+| <a id="pipelineschedulestatusactive"></a>`ACTIVE` | Active pipeline schedules. |
+| <a id="pipelineschedulestatusinactive"></a>`INACTIVE` | Inactive pipeline schedules. |
+
 ### `PipelineScopeEnum`
 
 | Value | Description |
diff --git a/doc/api/jobs.md b/doc/api/jobs.md
index 1548045d7c2..c3c5f118b1e 100644
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
@@ -76,6 +76,9 @@ Example of response
     "failure_reason": "script_failure",
     "tag": false,
     "web_url": "https://example.com/foo/bar/-/jobs/7",
+    "project": {
+      "ci_job_token_scope_enabled": false
+    },
     "user": {
       "id": 1,
       "name": "Administrator",
@@ -132,6 +135,9 @@ Example of response
     "failure_reason": "stuck_or_timeout_failure",
     "tag": false,
     "web_url": "https://example.com/foo/bar/-/jobs/6",
+    "project": {
+      "ci_job_token_scope_enabled": false
+    },
     "user": {
       "id": 1,
       "name": "Administrator",
@@ -216,6 +222,9 @@ Example of response
     "failure_reason": "stuck_or_timeout_failure",
     "tag": false,
     "web_url": "https://example.com/foo/bar/-/jobs/6",
+    "project": {
+      "ci_job_token_scope_enabled": false
+    },
     "user": {
       "id": 1,
       "name": "Administrator",
@@ -281,6 +290,9 @@ Example of response
     "failure_reason": "script_failure",
     "tag": false,
     "web_url": "https://example.com/foo/bar/-/jobs/7",
+    "project": {
+      "ci_job_token_scope_enabled": false
+    },
     "user": {
       "id": 1,
       "name": "Administrator",
diff --git a/doc/ci/pipelines/multi_project_pipelines.md b/doc/ci/pipelines/multi_project_pipelines.md
index 824f1445818..25ac9e13185 100644
--- a/doc/ci/pipelines/multi_project_pipelines.md
+++ b/doc/ci/pipelines/multi_project_pipelines.md
@@ -1,11 +1,11 @@
 ---
 redirect_to: 'downstream_pipelines.md'
-remove_date: '2022-11-31'
+remove_date: '2022-11-30'
 ---
 
 This document was moved to [another location](downstream_pipelines.md).
 
-<!-- This redirect file can be deleted after <2022-11-31>. -->
+<!-- This redirect file can be deleted after <2022-11-30>. -->
 <!-- Redirects that point to other docs in the same project expire in three months. -->
 <!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
 <!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/development/fe_guide/accessibility.md b/doc/development/fe_guide/accessibility.md
index bdd6c5d6e84..2c4abc9c94b 100644
--- a/doc/development/fe_guide/accessibility.md
+++ b/doc/development/fe_guide/accessibility.md
@@ -68,9 +68,9 @@ We should ensure that:
 
 To provide markup with accessible names, ensure every:
 
-- `input` has an associated `label`.
-- `button` and `a` have child text, or `aria-label` when child text isn't present, such as for an icon button with no content.
-- `img` has an `alt` attribute.
+- input has an [associated `label`](#examples-of-providing-accessible-names).
+- button and link have [visible text](#buttons-and-links-with-descriptive-accessible-names), or `aria-label` when there is no visible text, such as for an icon button with no content.
+- image has an [`alt` attribute](#images-with-accessible-names).
 - `fieldset` has `legend` as its first child.
 - `figure` has `figcaption` as its first child.
 - `table` has `caption` as its first child.
@@ -100,12 +100,12 @@ Text input examples:
 ```html
 <!-- Input with label -->
 <gl-form-group :label="__('Issue title')" label-for="issue-title">
-  <gl-form-input id="issue-title" v-model="title" name="title" />
+  <gl-form-input id="issue-title" v-model="title" />
 </gl-form-group>
 
 <!-- Input with hidden label -->
-<gl-form-group :label="__('Issue title')" label-for="issue-title" :label-sr-only="true">
-  <gl-form-input id="issue-title" v-model="title" name="title" />
+<gl-form-group :label="__('Issue title')" label-for="issue-title" label-sr-only>
+  <gl-form-input id="issue-title" v-model="title" />
 </gl-form-group>
 ```
 
@@ -114,12 +114,12 @@ Textarea examples:
 ```html
 <!-- Textarea with label -->
 <gl-form-group :label="__('Issue description')" label-for="issue-description">
-  <gl-form-textarea id="issue-description" v-model="description" name="description" />
+  <gl-form-textarea id="issue-description" v-model="description" />
 </gl-form-group>
 
 <!-- Textarea with hidden label -->
-<gl-form-group :label="__('Issue description')" label-for="issue-description" :label-sr-only="true">
-  <gl-form-textarea id="issue-description" v-model="description" name="description" />
+<gl-form-group :label="__('Issue description')" label-for="issue-description" label-sr-only>
+  <gl-form-textarea id="issue-description" v-model="description" />
 </gl-form-group>
 ```
 
@@ -128,11 +128,11 @@ Alternatively, you can use a plain `label` element:
 ```html
 <!-- Input with label using `label` -->
 <label for="issue-title">{{ __('Issue title') }}</label>
-<gl-form-input id="issue-title" v-model="title" name="title" />
+<gl-form-input id="issue-title" v-model="title" />
 
 <!-- Input with hidden label using `label` -->
 <label for="issue-title" class="gl-sr-only">{{ __('Issue title') }}</label>
-<gl-form-input id="issue-title" v-model="title" name="title" />
+<gl-form-input id="issue-title" v-model="title" />
 ```
 
 #### Select inputs with accessible names
@@ -142,12 +142,12 @@ Select input examples:
 ```html
 <!-- Select input with label -->
 <gl-form-group :label="__('Issue status')" label-for="issue-status">
-  <gl-form-select id="issue-status" v-model="status" name="status" :options="options" />
+  <gl-form-select id="issue-status" v-model="status" :options="options" />
 </gl-form-group>
 
 <!-- Select input with hidden label -->
-<gl-form-group :label="__('Issue status')" label-for="issue-status" :label-sr-only="true">
-  <gl-form-select id="issue-status" v-model="status" name="status" :options="options" />
+<gl-form-group :label="__('Issue status')" label-for="issue-status" label-sr-only>
+  <gl-form-select id="issue-status" v-model="status" :options="options" />
 </gl-form-group>
 ```
 
@@ -157,12 +157,12 @@ Single checkbox:
 
 ```html
 <!-- Single checkbox with label -->
-<gl-form-checkbox v-model="status" name="status" value="task-complete">
+<gl-form-checkbox v-model="status" value="task-complete">
   {{ __('Task complete') }}
 </gl-form-checkbox>
 
 <!-- Single checkbox with hidden label -->
-<gl-form-checkbox v-model="status" name="status" value="task-complete">
+<gl-form-checkbox v-model="status" value="task-complete">
   <span class="gl-sr-only">{{ __('Task complete') }}</span>
 </gl-form-checkbox>
 ```
@@ -172,24 +172,24 @@ Multiple checkboxes:
 ```html
 <!-- Multiple labeled checkboxes grouped within a fieldset -->
 <gl-form-group :label="__('Task list')">
-  <gl-form-checkbox name="task-list" value="task-1">{{ __('Task 1') }}</gl-form-checkbox>
-  <gl-form-checkbox name="task-list" value="task-2">{{ __('Task 2') }}</gl-form-checkbox>
+  <gl-form-checkbox value="task-1">{{ __('Task 1') }}</gl-form-checkbox>
+  <gl-form-checkbox value="task-2">{{ __('Task 2') }}</gl-form-checkbox>
 </gl-form-group>
 
 <!-- Or -->
 <gl-form-group :label="__('Task list')">
-  <gl-form-checkbox-group v-model="selected" :options="options" name="task-list" />
+  <gl-form-checkbox-group v-model="selected" :options="options" />
 </gl-form-group>
 
 <!-- Multiple labeled checkboxes grouped within a fieldset with hidden legend -->
-<gl-form-group :label="__('Task list')" :label-sr-only="true">
-  <gl-form-checkbox name="task-list" value="task-1">{{ __('Task 1') }}</gl-form-checkbox>
-  <gl-form-checkbox name="task-list" value="task-2">{{ __('Task 2') }}</gl-form-checkbox>
+<gl-form-group :label="__('Task list')" label-sr-only>
+  <gl-form-checkbox value="task-1">{{ __('Task 1') }}</gl-form-checkbox>
+  <gl-form-checkbox value="task-2">{{ __('Task 2') }}</gl-form-checkbox>
 </gl-form-group>
 
 <!-- Or -->
-<gl-form-group :label="__('Task list')" :label-sr-only="true">
-  <gl-form-checkbox-group v-model="selected" :options="options" name="task-list" />
+<gl-form-group :label="__('Task list')" label-sr-only>
+  <gl-form-checkbox-group v-model="selected" :options="options" />
 </gl-form-group>
 ```
 
@@ -199,12 +199,12 @@ Single radio input:
 
 ```html
 <!-- Single radio with a label -->
-<gl-form-radio v-model="status" name="status" value="opened">
+<gl-form-radio v-model="status" value="opened">
   {{ __('Opened') }}
 </gl-form-radio>
 
 <!-- Single radio with a hidden label -->
-<gl-form-radio v-model="status" name="status" value="opened">
+<gl-form-radio v-model="status" value="opened">
   <span class="gl-sr-only">{{ __('Opened') }}</span>
 </gl-form-radio>
 ```
@@ -214,24 +214,24 @@ Multiple radio inputs:
 ```html
 <!-- Multiple labeled radio inputs grouped within a fieldset -->
 <gl-form-group :label="__('Issue status')">
-  <gl-form-radio name="status" value="opened">{{ __('Opened') }}</gl-form-radio>
-  <gl-form-radio name="status" value="closed">{{ __('Closed') }}</gl-form-radio>
+  <gl-form-radio value="opened">{{ __('Opened') }}</gl-form-radio>
+  <gl-form-radio value="closed">{{ __('Closed') }}</gl-form-radio>
 </gl-form-group>
 
 <!-- Or -->
 <gl-form-group :label="__('Issue status')">
-  <gl-form-radio-group v-model="selected" :options="options" name="status" />
+  <gl-form-radio-group v-model="selected" :options="options" />
 </gl-form-group>
 
 <!-- Multiple labeled radio inputs grouped within a fieldset with hidden legend -->
-<gl-form-group :label="__('Issue status')" :label-sr-only="true">
-  <gl-form-radio name="status" value="opened">{{ __('Opened') }}</gl-form-radio>
-  <gl-form-radio name="status" value="closed">{{ __('Closed') }}</gl-form-radio>
+<gl-form-group :label="__('Issue status')" label-sr-only>
+  <gl-form-radio value="opened">{{ __('Opened') }}</gl-form-radio>
+  <gl-form-radio value="closed">{{ __('Closed') }}</gl-form-radio>
 </gl-form-group>
 
 <!-- Or -->
-<gl-form-group :label="__('Issue status')" :label-sr-only="true">
-  <gl-form-radio-group v-model="selected" :options="options" name="status" />
+<gl-form-group :label="__('Issue status')" label-sr-only>
+  <gl-form-radio-group v-model="selected" :options="options" />
 </gl-form-group>
 ```
 
@@ -242,11 +242,11 @@ File input examples:
 ```html
 <!-- File input with a label -->
 <label for="attach-file">{{ __('Attach a file') }}</label>
-<input id="attach-file" type="file" name="attach-file" />
+<input id="attach-file" type="file" />
 
 <!-- File input with a hidden label -->
 <label for="attach-file" class="gl-sr-only">{{ __('Attach a file') }}</label>
-<input id="attach-file" type="file" name="attach-file" />
+<input id="attach-file" type="file" />
 ```
 
 #### GlToggle components with an accessible names
@@ -337,7 +337,7 @@ element is interactive you must ensure:
 - It can receive keyboard focus.
 - It has a visible focus state.
 
-Use semantic HTML, such as `a` and `button`, which provides these behaviours by default.
+Use semantic HTML, such as `a` (`GlLink`) and `button` (`GlButton`), which provides these behaviours by default.
 
 Keep in mind that:
 
@@ -351,7 +351,7 @@ See the [Pajamas Keyboard-only page](https://design.gitlab.com/accessibility-aud
 
 Prefer **no** `tabindex` to using `tabindex`, since:
 
-- Using semantic HTML such as `button` implicitly provides `tabindex="0"`.
+- Using semantic HTML such as `button` (`GlButton`) implicitly provides `tabindex="0"`.
 - Tabbing order should match the visual reading order and positive `tabindex`s interfere with this.
 
 ### Avoid using `tabindex="0"` to make an element interactive
@@ -359,8 +359,8 @@ Prefer **no** `tabindex` to using `tabindex`, since:
 Use interactive elements instead of `div` and `span` tags.
 For example:
 
-- If the element should be clickable, use a `button`.
-- If the element should be text editable, use an `input` or `textarea`.
+- If the element should be clickable, use a `button` (`GlButton`).
+- If the element should be text editable, use an [`input` or `textarea`](#text-inputs-with-accessible-names).
 
 Once the markup is semantically complete, use CSS to update it to its desired visual state.
 
diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index 26826ec5832..f2b5d2a97ff 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -213,6 +213,16 @@ To view epics in a group:
 1. On the top bar, select **Main menu > Groups** and find your group.
 1. On the left sidebar, select **Epics**.
 
+### Who can view an epic
+
+Whether you can view an epic depends on the [group visibility level](../../public_access.md) and
+the epic's [confidentiality status](#make-an-epic-confidential):
+
+- Public group and a non-confidential epic: You don't have to be a member of the group.
+- Private group and non-confidential epic: You must have at least the Guest role for the group.
+- Confidential epic (regardless of group visibility): You must have at least the Reporter
+  role for the group.
+
 ### Cached epic count
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299540) in GitLab 13.11 [with a flag](../../../administration/feature_flags.md) named `cached_sidebar_open_epics_count`. Enabled by default.
@@ -329,8 +339,8 @@ automatically added to the epic.
 
 #### Add an existing issue to an epic
 
-Existing issues that belong to a project in an epic's group, or any of the epic's
-subgroups, are eligible to be added to the epic. Newly added issues appear at the top of the list of
+You can add existing issues to an epic, including issues in a project in an epic's group, or any of
+the epic's subgroups. Newly added issues appear at the top of the list of
 issues in the **Epics and Issues** tab.
 
 An epic contains a list of issues and an issue can be associated with at most one epic.
@@ -339,7 +349,7 @@ current parent.
 
 Prerequisites:
 
-- You must have at least the Reporter role for the epic's group.
+- You must be able to [view the epic](#who-can-view-an-epic).
 - You must be able to [edit the issue](../../project/issues/managing_issues.md#edit-an-issue).
 
 To add an existing issue to an epic:
@@ -356,14 +366,13 @@ To add an existing issue to an epic:
 
 #### Create an issue from an epic
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5419) in GitLab 12.7.
-
 Creating an issue from an epic enables you to maintain focus on the broader context of the epic
 while dividing work into smaller parts.
 
 Prerequisites:
 
-- You must have at least the Reporter role for the epic's group.
+- You must be able to [view the epic](#who-can-view-an-epic).
+- You must have at least the Reporter role for the project.
 
 To create an issue from an epic:
 
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 9a4590d9478..4608448271e 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -91,6 +91,7 @@ The following table lists project permissions available for each role:
 | [Issue boards](project/issue_board.md):<br>Create or delete lists                                                                                                                    |          | ✓        | ✓         | ✓          | ✓        |
 | [Issue boards](project/issue_board.md):<br>Move issues between lists                                                                                                                 |          | ✓        | ✓         | ✓          | ✓        |
 | [Issues](project/issues/index.md):<br>Add Labels                                                                                                                                     | ✓ (*15*) | ✓        | ✓         | ✓          | ✓        |
+| [Issues](project/issues/index.md):<br>Add to epic                                                                                                                                    |           | ✓ (*23*) | ✓ (*23*)  | ✓ (*23*)   | ✓ (*23*) |
 | [Issues](project/issues/index.md):<br>Assign                                                                                                                                         | ✓ (*15*) | ✓        | ✓         | ✓          | ✓        |
 | [Issues](project/issues/index.md):<br>Create (*18*)                                                                                                                                  | ✓        | ✓        | ✓         | ✓          | ✓        |
 | [Issues](project/issues/index.md):<br>Create [confidential issues](project/issues/confidential_issues.md)                                                                            | ✓        | ✓        | ✓         | ✓          | ✓        |
@@ -246,6 +247,7 @@ The following table lists project permissions available for each role:
 20. The ability to view the Container Registry and pull images is controlled by the [Container Registry's visibility permissions](packages/container_registry/index.md#container-registry-visibility-permissions).
 21. Maintainers cannot create, demote, or remove Owners, and they cannot promote users to the Owner role. They also cannot approve Owner role access requests.
 22. Authors of tasks can delete them even if they don't have the Owner role, but they have to have at least the Guest role for the project.
+23. You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic).
 
 <!-- markdownlint-enable MD029 -->
 
@@ -379,6 +381,7 @@ The following table lists group permissions available for each role:
 
 | Action                                                                                  | Guest | Reporter | Developer | Maintainer | Owner |
 |-----------------------------------------------------------------------------------------|-------|----------|-----------|------------|-------|
+| Add an issue to an [epic](group/epics/index.md)                                         | ✓ (7) | ✓ (7)    | ✓ (7)     | ✓ (7)      | ✓ (7) |
 | Browse group                                                                            | ✓     | ✓        | ✓         | ✓          | ✓     |
 | Pull a container image using the dependency proxy                                       | ✓     | ✓        | ✓         | ✓          | ✓     |
 | View Contribution analytics                                                             | ✓     | ✓        | ✓         | ✓          | ✓     |
@@ -445,6 +448,7 @@ The following table lists group permissions available for each role:
 4. Developers can push commits to the default branch of a new project only if the [default branch protection](group/manage.md#change-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected".
 5. In addition, if your group is public or internal, all users who can see the group can also see group wiki pages.
 6. Users can only view events based on their individual actions.
+7. You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic) and edit the issue.
 
 <!-- markdownlint-enable MD029 -->
 
diff --git a/lib/api/entities/license.rb b/lib/api/entities/license.rb
index d7a414344c1..8ecf8a430fe 100644
--- a/lib/api/entities/license.rb
+++ b/lib/api/entities/license.rb
@@ -2,6 +2,7 @@
 
 module API
   module Entities
+    # Serializes a Licensee::License
     class License < Entities::LicenseBasic
       expose :popular?, as: :popular
       expose(:description) { |license| license.meta['description'] }
diff --git a/lib/api/entities/license_basic.rb b/lib/api/entities/license_basic.rb
index 08af68785a9..0916738d21d 100644
--- a/lib/api/entities/license_basic.rb
+++ b/lib/api/entities/license_basic.rb
@@ -2,10 +2,16 @@
 
 module API
   module Entities
+    # Serializes a Gitlab::Git::DeclaredLicense
     class LicenseBasic < Grape::Entity
       expose :key, :name, :nickname
       expose :url, as: :html_url
-      expose(:source_url) { |license| license.meta['source'] }
+
+      # This was dropped:
+      # https://github.com/github/choosealicense.com/commit/325806b42aa3d5b78e84120327ec877bc936dbdd#diff-66df8f1997786f7052d29010f2cbb4c66391d60d24ca624c356acc0ab986f139
+      expose :source_url do |_|
+        nil
+      end
     end
   end
 end
diff --git a/lib/gitlab/batch_pop_queueing.rb b/lib/gitlab/batch_pop_queueing.rb
deleted file mode 100644
index 103ce644f2b..00000000000
--- a/lib/gitlab/batch_pop_queueing.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  ##
-  # This class is a queuing system for processing expensive tasks in an atomic manner
-  # with batch poping to let you optimize the total processing time.
-  #
-  # In usual queuing system, the first item started being processed immediately
-  # and the following items wait until the next items have been popped from the queue.
-  # On the other hand, this queueing system, the former part is same, however,
-  # it pops the enqueued items as batch. This is especially useful when you want to
-  # drop redundant items from the queue in order to process important items only,
-  # thus it's more efficient than the traditional queueing system.
-  #
-  # Caveats:
-  # - The order of the items are not guaranteed because of `sadd` (Redis Sets).
-  #
-  # Example:
-  # ```
-  # class TheWorker
-  #   def perform
-  #     result = Gitlab::BatchPopQueueing.new('feature', 'queue').safe_execute([item]) do |items_in_queue|
-  #       item = extract_the_most_important_item_from(items_in_queue)
-  #       expensive_process(item)
-  #     end
-  #
-  #     if result[:status] == :finished && result[:new_items].present?
-  #       item = extract_the_most_important_item_from(items_in_queue)
-  #       TheWorker.perform_async(item.id)
-  #     end
-  #   end
-  # end
-  # ```
-  #
-  class BatchPopQueueing
-    attr_reader :namespace, :queue_id
-
-    EXTRA_QUEUE_EXPIRE_WINDOW = 1.hour
-    MAX_COUNTS_OF_POP_ALL = 1000
-
-    # Initialize queue
-    #
-    # @param [String] namespace The namespace of the exclusive lock and queue key. Typically, it's a feature name.
-    # @param [String] queue_id The identifier of the queue.
-    # @return [Boolean]
-    def initialize(namespace, queue_id)
-      raise ArgumentError if namespace.empty? || queue_id.empty?
-
-      @namespace = namespace
-      @queue_id = queue_id
-    end
-
-    ##
-    # Execute the given block in an exclusive lock.
-    # If there is the other thread has already working on the block,
-    # it enqueues the items without processing the block.
-    #
-    # @param [Array<String>] new_items New items to be added to the queue.
-    # @param [Time] lock_timeout The timeout of the exclusive lock. Generally, this value should be longer than the maximum prosess timing of the given block.
-    # @return [Hash]
-    #   - status => One of the `:enqueued` or `:finished`.
-    #   - new_items => Newly enqueued items during the given block had been processed.
-    #
-    # NOTE: If an exception is raised in the block, the poppped items will not be recovered.
-    #       We should NOT re-enqueue the items in this case because it could end up in an infinite loop.
-    def safe_execute(new_items, lock_timeout: 10.minutes, &block)
-      enqueue(new_items, lock_timeout + EXTRA_QUEUE_EXPIRE_WINDOW)
-
-      lease = Gitlab::ExclusiveLease.new(lock_key, timeout: lock_timeout)
-
-      return { status: :enqueued } unless uuid = lease.try_obtain
-
-      begin
-        all_args = pop_all
-
-        yield all_args if block
-
-        { status: :finished, new_items: peek_all }
-      ensure
-        Gitlab::ExclusiveLease.cancel(lock_key, uuid)
-      end
-    end
-
-    private
-
-    def lock_key
-      @lock_key ||= "batch_pop_queueing:lock:#{namespace}:#{queue_id}"
-    end
-
-    def queue_key
-      @queue_key ||= "batch_pop_queueing:queue:#{namespace}:#{queue_id}"
-    end
-
-    def enqueue(items, expire_time)
-      Gitlab::Redis::Queues.with do |redis|
-        redis.sadd(queue_key, items)
-        redis.expire(queue_key, expire_time.to_i)
-      end
-    end
-
-    def pop_all
-      Gitlab::Redis::Queues.with do |redis|
-        redis.spop(queue_key, MAX_COUNTS_OF_POP_ALL)
-      end
-    end
-
-    def peek_all
-      Gitlab::Redis::Queues.with do |redis|
-        redis.smembers(queue_key)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/parsers/security/common.rb b/lib/gitlab/ci/parsers/security/common.rb
index da7faaab6ff..aa4fd644b2e 100644
--- a/lib/gitlab/ci/parsers/security/common.rb
+++ b/lib/gitlab/ci/parsers/security/common.rb
@@ -44,31 +44,15 @@ module Gitlab
           attr_reader :json_data, :report, :validate
 
           def valid?
-            # We want validation to happen regardless of VALIDATE_SCHEMA
-            # CI variable.
-            #
-            # Previously it controlled BOTH validation and enforcement of
-            # schema validation result.
-            #
-            # After 15.0 we will enforce schema validation by default
-            # See: https://gitlab.com/groups/gitlab-org/-/epics/6968
+            return true unless validate
+
+            schema_validation_passed = schema_validator.valid?
+
+            schema_validator.errors.each { |error| report.add_error('Schema', error) }
             schema_validator.deprecation_warnings.each { |deprecation_warning| report.add_warning('Schema', deprecation_warning) }
+            schema_validator.warnings.each { |warning| report.add_warning('Schema', warning) }
 
-            if validate
-              schema_validation_passed = schema_validator.valid?
-
-              # Validation warnings are errors
-              schema_validator.errors.each { |error| report.add_error('Schema', error) }
-              schema_validator.warnings.each { |warning| report.add_error('Schema', warning) }
-
-              schema_validation_passed
-            else
-              # Validation warnings are warnings
-              schema_validator.errors.each { |error| report.add_warning('Schema', error) }
-              schema_validator.warnings.each { |warning| report.add_warning('Schema', warning) }
-
-              true
-            end
+            schema_validation_passed
           end
 
           def schema_validator
diff --git a/lib/gitlab/git/declared_license.rb b/lib/gitlab/git/declared_license.rb
new file mode 100644
index 00000000000..bc12b1918ea
--- /dev/null
+++ b/lib/gitlab/git/declared_license.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Git
+    # DeclaredLicense is the software license declared in a LICENSE or COPYING
+    # file in the git repository.
+    class DeclaredLicense
+      # SPDX Identifier for the license
+      attr_reader :key
+
+      # Full name of the license
+      attr_reader :name
+
+      # Nickname of the license (optional, a shorter user-friendly name)
+      attr_reader :nickname
+
+      # Filename of the file containing license
+      attr_accessor :path
+
+      # URL that points to the LICENSE
+      attr_reader :url
+
+      def initialize(key: nil, name: nil, nickname: nil, url: nil, path: nil)
+        @key = key
+        @name = name
+        @nickname = nickname
+        @url = url
+        @path = path
+      end
+
+      def ==(other)
+        return unless other.is_a?(self.class)
+
+        key == other.key
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index f1cd75258be..d9b08f1d55a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -783,10 +783,29 @@ module Gitlab
         end
       end
 
-      def license_short_name
+      def license(from_gitaly)
         wrapped_gitaly_errors do
-          gitaly_repository_client.license_short_name
+          response = gitaly_repository_client.find_license
+
+          break nil if response.license_short_name.empty?
+
+          if from_gitaly
+            break ::Gitlab::Git::DeclaredLicense.new(key: response.license_short_name,
+                                                     name: response.license_name,
+                                                     nickname: response.license_nickname.presence,
+                                                     url: response.license_url.presence,
+                                                     path: response.license_path)
+          end
+
+          licensee_object = Licensee::License.new(response.license_short_name)
+
+          break nil if licensee_object.name.blank?
+
+          licensee_object
         end
+      rescue Licensee::InvalidLicense => e
+        Gitlab::ErrorTracking.track_exception(e)
+        nil
       end
 
       def fetch_source_branch!(source_repository, source_branch, local_ref)
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 04d6f92e8d8..c9e584a07ae 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -283,12 +283,10 @@ module Gitlab
         response.path.presence
       end
 
-      def license_short_name
+      def find_license
         request = Gitaly::FindLicenseRequest.new(repository: @gitaly_repo)
 
-        response = GitalyClient.call(@storage, :repository_service, :find_license, request, timeout: GitalyClient.fast_timeout)
-
-        response.license_short_name.presence
+        GitalyClient.call(@storage, :repository_service, :find_license, request, timeout: GitalyClient.fast_timeout)
       end
 
       def calculate_checksum
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 86e13a91f62..2589e868cab 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -30046,6 +30046,9 @@ msgstr ""
 msgid "Please use this form to report to the admin users who create spam issues, comments or behave inappropriately."
 msgstr ""
 
+msgid "Please wait a few moments while we load the file history for this line."
+msgstr ""
+
 msgid "Please wait a moment, this page will automatically refresh when ready."
 msgstr ""
 
@@ -44266,6 +44269,9 @@ msgstr ""
 msgid "Vulnerability|File"
 msgstr ""
 
+msgid "Vulnerability|File:"
+msgstr ""
+
 msgid "Vulnerability|GitLab Security Report"
 msgstr ""
 
@@ -44290,6 +44296,9 @@ msgstr ""
 msgid "Vulnerability|Links"
 msgstr ""
 
+msgid "Vulnerability|Location"
+msgstr ""
+
 msgid "Vulnerability|Method"
 msgstr ""
 
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index b30610d98d7..1f7c124a601 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -299,14 +299,16 @@ RSpec.describe ProjectsController do
       end
 
       it "renders files even with invalid license" do
+        invalid_license = ::Gitlab::Git::DeclaredLicense.new(key: 'woozle', name: 'woozle wuzzle')
+
         controller.instance_variable_set(:@project, public_project)
-        expect(public_project.repository).to receive(:license_key).and_return('woozle wuzzle').at_least(:once)
+        expect(public_project.repository).to receive(:license).and_return(invalid_license).at_least(:once)
 
         get_show
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template('_files')
-        expect(response.body).to have_content('LICENSE') # would be 'MIT license' if stub not works
+        expect(response.body).to have_content('woozle wuzzle')
       end
 
       describe 'tracking events', :snowplow do
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 13a4c1b5912..93e5be18229 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -675,7 +675,7 @@ RSpec.describe 'File blob', :js do
           expect(page).to have_content('This project is licensed under the MIT License.')
 
           # shows a learn more link
-          expect(page).to have_link('Learn more', href: 'http://choosealicense.com/licenses/mit/')
+          expect(page).to have_link('Learn more', href: 'https://opensource.org/licenses/MIT')
         end
       end
     end
diff --git a/spec/fixtures/security_reports/feature-branch/gl-sast-report.json b/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
index 51761583c70..083042e19ff 100644
--- a/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
+++ b/spec/fixtures/security_reports/feature-branch/gl-sast-report.json
@@ -171,7 +171,7 @@
     },
     "type": "sast",
     "status": "success",
-    "start_time": "placeholder-value",
-    "end_time": "placeholder-value"
+    "start_time": "2022-08-10T22:37:00",
+    "end_time": "2022-08-10T22:38:00"
   }
 }
\ No newline at end of file
diff --git a/spec/fixtures/security_reports/master/gl-common-scanning-report-names.json b/spec/fixtures/security_reports/master/gl-common-scanning-report-names.json
index ef2ff7443d3..cdad960026c 100644
--- a/spec/fixtures/security_reports/master/gl-common-scanning-report-names.json
+++ b/spec/fixtures/security_reports/master/gl-common-scanning-report-names.json
@@ -12,8 +12,29 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
-      "identifiers": [],
+      "location": {
+        "file": "yarn/yarn.lock",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
+      "identifiers": [
+        {
+          "value": "2017-11429",
+          "type": "cwe",
+          "name": "CWE-2017-11429",
+          "url": "https://cve.mitre.org/cgi-bin/cwename.cgi?name=CWE-2017-11429"
+        },
+        {
+          "value": "2017-11429",
+          "type": "cve",
+          "name": "CVE-2017-11429",
+          "url": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11429"
+        }
+      ],
       "links": [
         {
           "url": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1020"
@@ -33,8 +54,29 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
-      "identifiers": [],
+      "location": {
+        "file": "yarn/yarn.lock",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
+      "identifiers": [
+        {
+          "value": "2017-11429",
+          "type": "cwe",
+          "name": "CWE-2017-11429",
+          "url": "https://cve.mitre.org/cgi-bin/cwename.cgi?name=CWE-2017-11429"
+        },
+        {
+          "value": "2017-11429",
+          "type": "cve",
+          "name": "CVE-2017-11429",
+          "url": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11429"
+        }
+      ],
       "links": [
         {
           "name": "CVE-1030",
@@ -161,8 +203,9 @@
       "version": "2.18.0"
     },
     "type": "dependency_scanning",
-    "start_time": "placeholder-value",
-    "end_time": "placeholder-value",
+    "start_time": "2022-08-10T21:37:00",
+    "end_time": "2022-08-10T21:38:00",
     "status": "success"
-  }
-}
\ No newline at end of file
+  },
+  "version": "14.0.6"
+}
diff --git a/spec/fixtures/security_reports/master/gl-common-scanning-report.json b/spec/fixtures/security_reports/master/gl-common-scanning-report.json
index 1295b44d4df..4c494963a79 100644
--- a/spec/fixtures/security_reports/master/gl-common-scanning-report.json
+++ b/spec/fixtures/security_reports/master/gl-common-scanning-report.json
@@ -12,7 +12,15 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -27,18 +35,8 @@
       ],
       "details": {
         "commit": {
-          "name": [
-            {
-              "lang": "en",
-              "value": "The Commit"
-            }
-          ],
-          "description": [
-            {
-              "lang": "en",
-              "value": "Commit where the vulnerability was identified"
-            }
-          ],
+          "name": "the commit",
+          "description": "description",
           "type": "commit",
           "value": "41df7b7eb3be2b5be2c406c2f6d28cd6631eeb19"
         }
@@ -56,7 +54,15 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -71,18 +77,8 @@
       ],
       "details": {
         "commit": {
-          "name": [
-            {
-              "lang": "en",
-              "value": "The Commit"
-            }
-          ],
-          "description": [
-            {
-              "lang": "en",
-              "value": "Commit where the vulnerability was identified"
-            }
-          ],
+          "name": "the commit",
+          "description": "description",
           "type": "commit",
           "value": "41df7b7eb3be2b5be2c406c2f6d28cd6631eeb19"
         }
@@ -100,7 +96,15 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -115,18 +119,8 @@
       ],
       "details": {
         "commit": {
-          "name": [
-            {
-              "lang": "en",
-              "value": "The Commit"
-            }
-          ],
-          "description": [
-            {
-              "lang": "en",
-              "value": "Commit where the vulnerability was identified"
-            }
-          ],
+          "name": "the commit",
+          "description": "description",
           "type": "commit",
           "value": "41df7b7eb3be2b5be2c406c2f6d28cd6631eeb19"
         }
@@ -144,7 +138,15 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -159,18 +161,8 @@
       ],
       "details": {
         "commit": {
-          "name": [
-            {
-              "lang": "en",
-              "value": "The Commit"
-            }
-          ],
-          "description": [
-            {
-              "lang": "en",
-              "value": "Commit where the vulnerability was identified"
-            }
-          ],
+          "name": "the commit",
+          "description": "description",
           "type": "commit",
           "value": "41df7b7eb3be2b5be2c406c2f6d28cd6631eeb19"
         }
@@ -258,7 +250,15 @@
           }
         ]
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -273,18 +273,8 @@
       ],
       "details": {
         "commit": {
-          "name": [
-            {
-              "lang": "en",
-              "value": "The Commit"
-            }
-          ],
-          "description": [
-            {
-              "lang": "en",
-              "value": "Commit where the vulnerability was identified"
-            }
-          ],
+          "name": "the commit",
+          "description": "description",
           "type": "commit",
           "value": "41df7b7eb3be2b5be2c406c2f6d28cd6631eeb19"
         }
@@ -373,7 +363,15 @@
           }
         ]
       },
-      "location": {},
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
       "identifiers": [
         {
           "type": "GitLab",
@@ -400,8 +398,22 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
-      "location": {},
-      "identifiers": [],
+      "location": {
+        "file": "some/kind/of/file.c",
+        "dependency": {
+          "package": {
+            "name": "io.netty/netty"
+          },
+          "version": "3.9.1.Final"
+        }
+      },
+      "identifiers": [
+        {
+          "type": "GitLab",
+          "name": "Foo vulnerability",
+          "value": "foo"
+        }
+      ],
       "links": []
     }
   ],
@@ -442,8 +454,8 @@
           "cve": "CVE-1020"
         }
       ],
-      "summary": "",
-      "diff": ""
+      "summary": "this fixes CVE-1020",
+      "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5"
     },
     {
       "fixes": [
@@ -452,8 +464,8 @@
           "id": "bb2fbeb1b71ea360ce3f86f001d4e84823c3ffe1a1f7d41ba7466b14cfa953d3"
         }
       ],
-      "summary": "",
-      "diff": ""
+      "summary": "this fixes CVE",
+      "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5"
     },
     {
       "fixes": [
@@ -462,8 +474,8 @@
           "id": "bb2fbeb1b71ea360ce3f86f001d4e84823c3ffe1a1f7d41ba7466b14cfa953d3"
         }
       ],
-      "summary": "",
-      "diff": ""
+      "summary": "this fixed CVE",
+      "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5"
     },
     {
       "fixes": [
@@ -472,8 +484,8 @@
           "cve": "CVE-1"
         }
       ],
-      "summary": "",
-      "diff": ""
+      "summary": "this fixes CVE-1",
+      "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5"
     }
   ],
   "dependency_files": [],
@@ -497,9 +509,9 @@
       "version": "2.18.0"
     },
     "type": "dependency_scanning",
-    "start_time": "placeholder-value",
-    "end_time": "placeholder-value",
+    "start_time": "2022-08-10T21:37:00",
+    "end_time": "2022-08-10T21:38:00",
     "status": "success"
   },
   "version": "14.0.2"
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/security_reports/master/gl-sast-report-minimal.json b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
index 5e9273d43b1..53d15224b30 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json
@@ -62,7 +62,7 @@
     },
     "type": "sast",
     "status": "success",
-    "start_time": "placeholder-value",
-    "end_time": "placeholder-value"
+    "start_time": "2022-08-10T21:37:00",
+    "end_time": "2022-08-10T21:38:00"
   }
 }
\ No newline at end of file
diff --git a/spec/fixtures/security_reports/master/gl-sast-report.json b/spec/fixtures/security_reports/master/gl-sast-report.json
index 1aa8db1a65f..0ec31252e97 100644
--- a/spec/fixtures/security_reports/master/gl-sast-report.json
+++ b/spec/fixtures/security_reports/master/gl-sast-report.json
@@ -194,7 +194,7 @@
     },
     "type": "sast",
     "status": "success",
-    "start_time": "placeholder-value",
-    "end_time": "placeholder-value"
+    "start_time": "2022-08-10T21:37:00",
+    "end_time": "2022-08-10T21:38:00"
   }
 }
\ No newline at end of file
diff --git a/spec/fixtures/security_reports/master/gl-secret-detection-report.json b/spec/fixtures/security_reports/master/gl-secret-detection-report.json
index 21d4f3f1798..cb97b60ced1 100644
--- a/spec/fixtures/security_reports/master/gl-secret-detection-report.json
+++ b/spec/fixtures/security_reports/master/gl-secret-detection-report.json
@@ -18,6 +18,9 @@
         "file": "aws-key.py",
         "dependency": {
           "package": {}
+        },
+        "commit": {
+          "sha": "e9c3a56590d5bed4155c0d128f1552d52fdcc7ae"
         }
       },
       "identifiers": [
diff --git a/spec/frontend/blame/blame_redirect_spec.js b/spec/frontend/blame/blame_redirect_spec.js
new file mode 100644
index 00000000000..beb10139b3a
--- /dev/null
+++ b/spec/frontend/blame/blame_redirect_spec.js
@@ -0,0 +1,70 @@
+import redirectToCorrectPage from '~/blame/blame_redirect';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
+import { createAlert } from '~/flash';
+
+jest.mock('~/flash');
+
+describe('Blame page redirect', () => {
+  beforeEach(() => {
+    global.window = Object.create(window);
+    const url = 'https://gitlab.com/flightjs/Flight/-/blame/master/file.json';
+    Object.defineProperty(window, 'location', {
+      writable: true,
+      value: {
+        href: url,
+        hash: '',
+        search: '',
+      },
+    });
+
+    setHTMLFixture(`<div class="js-per-page" data-per-page="1000"></div>`);
+  });
+
+  afterEach(() => {
+    createAlert.mockClear();
+    resetHTMLFixture();
+  });
+
+  it('performs redirect to further pages when needed', () => {
+    window.location.hash = '#L1001';
+    redirectToCorrectPage();
+    expect(window.location.href).toMatch('?page=2');
+  });
+
+  it('performs redirect back to first page when needed', () => {
+    window.location.href = 'https://gitlab.com/flightjs/Flight/-/blame/master/file.json';
+    window.location.search = '?page=200';
+    window.location.hash = '#L999';
+    redirectToCorrectPage();
+    expect(window.location.href).toMatch('?page=1');
+  });
+
+  it('doesn`t perform redirect when the line is still on page 1', () => {
+    window.location.hash = '#L1000';
+    redirectToCorrectPage();
+    expect(window.location.href).not.toMatch('?page');
+  });
+
+  it('doesn`t perform redirect when "no_pagination" param is present', () => {
+    window.location.href = 'https://gitlab.com/flightjs/Flight/-/blame/master/file.json';
+    window.location.search = '?no_pagination=true';
+    window.location.hash = '#L1001';
+    redirectToCorrectPage();
+    expect(window.location.href).not.toMatch('?page');
+  });
+
+  it('doesn`t perform redirect when perPage is not present', () => {
+    setHTMLFixture(`<div class="js-per-page"></div>`);
+    window.location.hash = '#L1001';
+    redirectToCorrectPage();
+    expect(window.location.href).not.toMatch('?page');
+  });
+
+  it('shows alert with a message', () => {
+    window.location.hash = '#L1001';
+    redirectToCorrectPage();
+    expect(createAlert).toHaveBeenCalledWith({
+      message: 'Please wait a few moments while we load the file history for this line.',
+    });
+  });
+});
diff --git a/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_row_spec.js b/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_row_spec.js
index 6fe3dabc603..4dea34ebd41 100644
--- a/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_row_spec.js
+++ b/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_row_spec.js
@@ -8,8 +8,8 @@ import { defaultConfig, harborTagsList } from '../../mock_data';
 describe('Harbor tag list row', () => {
   let wrapper;
 
-  const findListItem = () => wrapper.find(ListItem);
-  const findClipboardButton = () => wrapper.find(ClipboardButton);
+  const findListItem = () => wrapper.findComponent(ListItem);
+  const findClipboardButton = () => wrapper.findComponent(ClipboardButton);
   const findByTestId = (testId) => wrapper.findByTestId(testId);
 
   const $route = {
diff --git a/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_spec.js b/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_spec.js
index 6bcf6611d07..4c6b2b6daaa 100644
--- a/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_spec.js
+++ b/spec/frontend/packages_and_registries/harbor_registry/components/tags/tags_list_spec.js
@@ -8,9 +8,9 @@ import { defaultConfig, harborTagsResponse } from '../../mock_data';
 describe('Harbor Tags List', () => {
   let wrapper;
 
-  const findTagsLoader = () => wrapper.find(TagsLoader);
+  const findTagsLoader = () => wrapper.findComponent(TagsLoader);
   const findTagsListRows = () => wrapper.findAllComponents(TagsListRow);
-  const findRegistryList = () => wrapper.find(RegistryList);
+  const findRegistryList = () => wrapper.findComponent(RegistryList);
 
   const mountComponent = ({ propsData, config = defaultConfig }) => {
     wrapper = shallowMount(TagsList, {
diff --git a/spec/frontend/packages_and_registries/harbor_registry/pages/tags_spec.js b/spec/frontend/packages_and_registries/harbor_registry/pages/tags_spec.js
index 7e0f05e736b..10901c6ec1e 100644
--- a/spec/frontend/packages_and_registries/harbor_registry/pages/tags_spec.js
+++ b/spec/frontend/packages_and_registries/harbor_registry/pages/tags_spec.js
@@ -15,8 +15,8 @@ jest.mock('~/rest_api', () => ({
 describe('Harbor Tags page', () => {
   let wrapper;
 
-  const findTagsHeader = () => wrapper.find(TagsHeader);
-  const findTagsList = () => wrapper.find(TagsList);
+  const findTagsHeader = () => wrapper.findComponent(TagsHeader);
+  const findTagsList = () => wrapper.findComponent(TagsList);
 
   const waitForHarborTagsRequest = async () => {
     await waitForPromises();
diff --git a/spec/frontend/repository/components/table/index_spec.js b/spec/frontend/repository/components/table/index_spec.js
index 697d2dcc7f5..2180f78a8df 100644
--- a/spec/frontend/repository/components/table/index_spec.js
+++ b/spec/frontend/repository/components/table/index_spec.js
@@ -159,7 +159,7 @@ describe('Repository table component', () => {
   });
 
   describe('Show more button', () => {
-    const showMoreButton = () => vm.find(GlButton);
+    const showMoreButton = () => vm.findComponent(GlButton);
 
     it.each`
       hasMore  | expectButtonToExist
diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js
index 9daae8c36ef..03fb4242e40 100644
--- a/spec/frontend/repository/components/table/parent_row_spec.js
+++ b/spec/frontend/repository/components/table/parent_row_spec.js
@@ -39,7 +39,7 @@ describe('Repository parent row component', () => {
   `('renders link in $path to $to', ({ path, to }) => {
     factory(path);
 
-    expect(vm.find(RouterLinkStub).props().to).toEqual({
+    expect(vm.findComponent(RouterLinkStub).props().to).toEqual({
       path: to,
     });
   });
@@ -69,6 +69,6 @@ describe('Repository parent row component', () => {
   it('renders loading icon when loading parent', () => {
     factory('app/assets', 'app');
 
-    expect(vm.find(GlLoadingIcon).exists()).toBe(true);
+    expect(vm.findComponent(GlLoadingIcon).exists()).toBe(true);
   });
 });
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index 13b09e57473..64aa6d179a8 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -47,7 +47,7 @@ function factory(propsData = {}) {
 }
 
 describe('Repository table row component', () => {
-  const findRouterLink = () => vm.find(RouterLinkStub);
+  const findRouterLink = () => vm.findComponent(RouterLinkStub);
   const findIntersectionObserver = () => vm.findComponent(GlIntersectionObserver);
 
   afterEach(() => {
@@ -124,7 +124,7 @@ describe('Repository table row component', () => {
     });
 
     await nextTick();
-    expect(vm.find(component).exists()).toBe(true);
+    expect(vm.findComponent(component).exists()).toBe(true);
   });
 
   it.each`
@@ -141,7 +141,7 @@ describe('Repository table row component', () => {
     });
 
     await nextTick();
-    expect(vm.find({ ref: 'link' }).props('to')).toEqual({
+    expect(vm.findComponent({ ref: 'link' }).props('to')).toEqual({
       path: `/-/tree/main/${encodeURIComponent(path)}`,
     });
   });
@@ -197,7 +197,7 @@ describe('Repository table row component', () => {
     });
 
     await nextTick();
-    expect(vm.find(GlBadge).exists()).toBe(true);
+    expect(vm.findComponent(GlBadge).exists()).toBe(true);
   });
 
   it('renders commit and web links with href for submodule', async () => {
@@ -213,7 +213,7 @@ describe('Repository table row component', () => {
 
     await nextTick();
     expect(vm.find('a').attributes('href')).toEqual('https://test.com');
-    expect(vm.find(GlLink).attributes('href')).toEqual('https://test.com/commit');
+    expect(vm.findComponent(GlLink).attributes('href')).toEqual('https://test.com/commit');
   });
 
   it('renders lock icon', async () => {
@@ -226,8 +226,8 @@ describe('Repository table row component', () => {
     });
 
     await nextTick();
-    expect(vm.find(GlIcon).exists()).toBe(true);
-    expect(vm.find(GlIcon).props('name')).toBe('lock');
+    expect(vm.findComponent(GlIcon).exists()).toBe(true);
+    expect(vm.findComponent(GlIcon).props('name')).toBe('lock');
   });
 
   it('renders loading icon when path is loading', () => {
@@ -240,7 +240,7 @@ describe('Repository table row component', () => {
       loadingPath: 'test',
     });
 
-    expect(vm.find(FileIcon).props('loading')).toBe(true);
+    expect(vm.findComponent(FileIcon).props('loading')).toBe(true);
   });
 
   describe('row visibility', () => {
diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js
index 9d3a5394df8..352f4314232 100644
--- a/spec/frontend/repository/components/tree_content_spec.js
+++ b/spec/frontend/repository/components/tree_content_spec.js
@@ -38,7 +38,7 @@ function factory(path, data = () => ({})) {
 }
 
 describe('Repository table component', () => {
-  const findFileTable = () => vm.find(FileTable);
+  const findFileTable = () => vm.findComponent(FileTable);
 
   afterEach(() => {
     vm.destroy();
@@ -53,7 +53,7 @@ describe('Repository table component', () => {
 
     await nextTick();
 
-    expect(vm.find(FilePreview).exists()).toBe(true);
+    expect(vm.findComponent(FilePreview).exists()).toBe(true);
   });
 
   it('trigger fetchFiles and resetRequestedCommits when mounted', async () => {
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index 505ff7f3dd6..30a24315338 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -47,12 +47,12 @@ describe('UploadBlobModal', () => {
     });
   };
 
-  const findModal = () => wrapper.find(GlModal);
-  const findAlert = () => wrapper.find(GlAlert);
-  const findCommitMessage = () => wrapper.find(GlFormTextarea);
-  const findBranchName = () => wrapper.find(GlFormInput);
-  const findMrToggle = () => wrapper.find(GlToggle);
-  const findUploadDropzone = () => wrapper.find(UploadDropzone);
+  const findModal = () => wrapper.findComponent(GlModal);
+  const findAlert = () => wrapper.findComponent(GlAlert);
+  const findCommitMessage = () => wrapper.findComponent(GlFormTextarea);
+  const findBranchName = () => wrapper.findComponent(GlFormInput);
+  const findMrToggle = () => wrapper.findComponent(GlToggle);
+  const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
   const actionButtonDisabledState = () => findModal().props('actionPrimary').attributes[0].disabled;
   const cancelButtonDisabledState = () => findModal().props('actionCancel').attributes[0].disabled;
   const actionButtonLoadingState = () => findModal().props('actionPrimary').attributes[0].loading;
diff --git a/spec/frontend/repository/pages/blob_spec.js b/spec/frontend/repository/pages/blob_spec.js
index 41ab4d616b8..4fe6188370e 100644
--- a/spec/frontend/repository/pages/blob_spec.js
+++ b/spec/frontend/repository/pages/blob_spec.js
@@ -7,7 +7,7 @@ jest.mock('~/repository/utils/dom');
 describe('Repository blob page component', () => {
   let wrapper;
 
-  const findBlobContentViewer = () => wrapper.find(BlobContentViewer);
+  const findBlobContentViewer = () => wrapper.findComponent(BlobContentViewer);
   const path = 'file.js';
 
   beforeEach(() => {
diff --git a/spec/frontend/repository/pages/index_spec.js b/spec/frontend/repository/pages/index_spec.js
index c0afb7931b1..559257d414c 100644
--- a/spec/frontend/repository/pages/index_spec.js
+++ b/spec/frontend/repository/pages/index_spec.js
@@ -34,7 +34,7 @@ describe('Repository index page component', () => {
   it('renders TreePage', () => {
     factory();
 
-    const child = wrapper.find(TreePage);
+    const child = wrapper.findComponent(TreePage);
 
     expect(child.exists()).toBe(true);
     expect(child.props()).toEqual({ path: '/' });
diff --git a/spec/frontend/runner/admin_runners/admin_runners_app_spec.js b/spec/frontend/runner/admin_runners/admin_runners_app_spec.js
index 55a298e1695..c1c9daab2a5 100644
--- a/spec/frontend/runner/admin_runners/admin_runners_app_spec.js
+++ b/spec/frontend/runner/admin_runners/admin_runners_app_spec.js
@@ -195,7 +195,7 @@ describe('AdminRunnersApp', () => {
     const { id, shortSha } = mockRunners[0];
     const numericId = getIdFromGraphQLId(id);
 
-    const runnerLink = wrapper.find('tr [data-testid="td-summary"]').find(GlLink);
+    const runnerLink = wrapper.find('tr [data-testid="td-summary"]').findComponent(GlLink);
 
     expect(runnerLink.text()).toBe(`#${numericId} (${shortSha})`);
     expect(runnerLink.attributes('href')).toBe(`http://localhost/admin/runners/${numericId}`);
@@ -204,7 +204,9 @@ describe('AdminRunnersApp', () => {
   it('renders runner actions for each runner', async () => {
     await createComponent({ mountFn: mountExtended });
 
-    const runnerActions = wrapper.find('tr [data-testid="td-actions"]').find(RunnerActionsCell);
+    const runnerActions = wrapper
+      .find('tr [data-testid="td-actions"]')
+      .findComponent(RunnerActionsCell);
     const runner = mockRunners[0];
 
     expect(runnerActions.props()).toEqual({
@@ -255,7 +257,7 @@ describe('AdminRunnersApp', () => {
     });
 
     it('Links to the runner page', async () => {
-      const runnerLink = wrapper.find('tr [data-testid="td-summary"]').find(GlLink);
+      const runnerLink = wrapper.find('tr [data-testid="td-summary"]').findComponent(GlLink);
 
       expect(runnerLink.text()).toBe(`#${id} (${shortSha})`);
       expect(runnerLink.attributes('href')).toBe(`http://localhost/admin/runners/${id}`);
diff --git a/spec/frontend/runner/components/cells/link_cell_spec.js b/spec/frontend/runner/components/cells/link_cell_spec.js
index a59a0eaa5d8..46ab1adb6b6 100644
--- a/spec/frontend/runner/components/cells/link_cell_spec.js
+++ b/spec/frontend/runner/components/cells/link_cell_spec.js
@@ -5,7 +5,7 @@ import LinkCell from '~/runner/components/cells/link_cell.vue';
 describe('LinkCell', () => {
   let wrapper;
 
-  const findGlLink = () => wrapper.find(GlLink);
+  const findGlLink = () => wrapper.findComponent(GlLink);
   const findSpan = () => wrapper.find('span');
 
   const createComponent = ({ props = {}, ...options } = {}) => {
diff --git a/spec/frontend/runner/components/cells/runner_stacked_summary_cell_spec.js b/spec/frontend/runner/components/cells/runner_stacked_summary_cell_spec.js
index 21ec9f61f37..e7cadefc140 100644
--- a/spec/frontend/runner/components/cells/runner_stacked_summary_cell_spec.js
+++ b/spec/frontend/runner/components/cells/runner_stacked_summary_cell_spec.js
@@ -85,7 +85,7 @@ describe('RunnerTypeCell', () => {
       contactedAt: '2022-01-02',
     });
 
-    expect(findRunnerSummaryField('clock').find(TimeAgo).props('time')).toBe('2022-01-02');
+    expect(findRunnerSummaryField('clock').findComponent(TimeAgo).props('time')).toBe('2022-01-02');
   });
 
   it('Displays empty last contact', () => {
@@ -93,7 +93,7 @@ describe('RunnerTypeCell', () => {
       contactedAt: null,
     });
 
-    expect(findRunnerSummaryField('clock').find(TimeAgo).exists()).toBe(false);
+    expect(findRunnerSummaryField('clock').findComponent(TimeAgo).exists()).toBe(false);
     expect(findRunnerSummaryField('clock').text()).toContain(__('Never'));
   });
 
@@ -134,7 +134,7 @@ describe('RunnerTypeCell', () => {
   });
 
   it('Displays created at', () => {
-    expect(findRunnerSummaryField('calendar').find(TimeAgo).props('time')).toBe(
+    expect(findRunnerSummaryField('calendar').findComponent(TimeAgo).props('time')).toBe(
       mockRunner.createdAt,
     );
   });
diff --git a/spec/frontend/runner/components/runner_type_tabs_spec.js b/spec/frontend/runner/components/runner_type_tabs_spec.js
index 45ab8684332..1577d3b1f72 100644
--- a/spec/frontend/runner/components/runner_type_tabs_spec.js
+++ b/spec/frontend/runner/components/runner_type_tabs_spec.js
@@ -113,7 +113,7 @@ describe('RunnerTypeTabs', () => {
     });
 
     findTabs().wrappers.forEach((tab) => {
-      expect(tab.find(RunnerCount).props()).toEqual({
+      expect(tab.findComponent(RunnerCount).props()).toEqual({
         scope: INSTANCE_TYPE,
         skip: false,
         variables: expect.objectContaining(mockVariables),
diff --git a/spec/frontend/runner/components/runner_update_form_spec.js b/spec/frontend/runner/components/runner_update_form_spec.js
index 7b67a89f989..e12736216a0 100644
--- a/spec/frontend/runner/components/runner_update_form_spec.js
+++ b/spec/frontend/runner/components/runner_update_form_spec.js
@@ -145,7 +145,7 @@ describe('RunnerUpdateForm', () => {
     });
 
     it('Form skeleton is shown', () => {
-      expect(wrapper.find(GlSkeletonLoader).exists()).toBe(true);
+      expect(wrapper.findComponent(GlSkeletonLoader).exists()).toBe(true);
       expect(findFields()).toHaveLength(0);
     });
 
diff --git a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
index a377ddae0eb..c57eabd57b9 100644
--- a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
@@ -34,7 +34,7 @@ describe('ConfidentialityFilter', () => {
     wrapper = null;
   });
 
-  const findRadioFilter = () => wrapper.find(RadioFilter);
+  const findRadioFilter = () => wrapper.findComponent(RadioFilter);
 
   describe('template', () => {
     beforeEach(() => {
diff --git a/spec/frontend/search/sidebar/components/radio_filter_spec.js b/spec/frontend/search/sidebar/components/radio_filter_spec.js
index c0a8259b4fe..94d529348a9 100644
--- a/spec/frontend/search/sidebar/components/radio_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/radio_filter_spec.js
@@ -43,7 +43,7 @@ describe('RadioFilter', () => {
     wrapper = null;
   });
 
-  const findGlRadioButtonGroup = () => wrapper.find(GlFormRadioGroup);
+  const findGlRadioButtonGroup = () => wrapper.findComponent(GlFormRadioGroup);
   const findGlRadioButtons = () => findGlRadioButtonGroup().findAllComponents(GlFormRadio);
   const findGlRadioButtonsText = () => findGlRadioButtons().wrappers.map((w) => w.text());
 
diff --git a/spec/frontend/search/sidebar/components/status_filter_spec.js b/spec/frontend/search/sidebar/components/status_filter_spec.js
index 5d8ecd8733a..f3152c014b6 100644
--- a/spec/frontend/search/sidebar/components/status_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/status_filter_spec.js
@@ -34,7 +34,7 @@ describe('StatusFilter', () => {
     wrapper = null;
   });
 
-  const findRadioFilter = () => wrapper.find(RadioFilter);
+  const findRadioFilter = () => wrapper.findComponent(RadioFilter);
 
   describe('template', () => {
     beforeEach(() => {
diff --git a/spec/frontend/search/sort/components/app_spec.js b/spec/frontend/search/sort/components/app_spec.js
index 0e8eebba3cb..a566b9b99d3 100644
--- a/spec/frontend/search/sort/components/app_spec.js
+++ b/spec/frontend/search/sort/components/app_spec.js
@@ -43,9 +43,9 @@ describe('GlobalSearchSort', () => {
     wrapper = null;
   });
 
-  const findSortButtonGroup = () => wrapper.find(GlButtonGroup);
-  const findSortDropdown = () => wrapper.find(GlDropdown);
-  const findSortDirectionButton = () => wrapper.find(GlButton);
+  const findSortButtonGroup = () => wrapper.findComponent(GlButtonGroup);
+  const findSortDropdown = () => wrapper.findComponent(GlDropdown);
+  const findSortDirectionButton = () => wrapper.findComponent(GlButton);
   const findDropdownItems = () => findSortDropdown().findAllComponents(GlDropdownItem);
   const findDropdownItemsText = () => findDropdownItems().wrappers.map((w) => w.text());
 
diff --git a/spec/frontend/search/topbar/components/app_spec.js b/spec/frontend/search/topbar/components/app_spec.js
index 0a44688bfe0..c7fd7084101 100644
--- a/spec/frontend/search/topbar/components/app_spec.js
+++ b/spec/frontend/search/topbar/components/app_spec.js
@@ -36,9 +36,9 @@ describe('GlobalSearchTopbar', () => {
     wrapper.destroy();
   });
 
-  const findGlSearchBox = () => wrapper.find(GlSearchBoxByClick);
-  const findGroupFilter = () => wrapper.find(GroupFilter);
-  const findProjectFilter = () => wrapper.find(ProjectFilter);
+  const findGlSearchBox = () => wrapper.findComponent(GlSearchBoxByClick);
+  const findGroupFilter = () => wrapper.findComponent(GroupFilter);
+  const findProjectFilter = () => wrapper.findComponent(ProjectFilter);
 
   describe('template', () => {
     beforeEach(() => {
diff --git a/spec/frontend/search/topbar/components/group_filter_spec.js b/spec/frontend/search/topbar/components/group_filter_spec.js
index bd173791fee..b2d0297fdc2 100644
--- a/spec/frontend/search/topbar/components/group_filter_spec.js
+++ b/spec/frontend/search/topbar/components/group_filter_spec.js
@@ -53,7 +53,7 @@ describe('GroupFilter', () => {
     wrapper.destroy();
   });
 
-  const findSearchableDropdown = () => wrapper.find(SearchableDropdown);
+  const findSearchableDropdown = () => wrapper.findComponent(SearchableDropdown);
 
   describe('template', () => {
     beforeEach(() => {
diff --git a/spec/frontend/search/topbar/components/project_filter_spec.js b/spec/frontend/search/topbar/components/project_filter_spec.js
index 5afcd281d0c..297a536e075 100644
--- a/spec/frontend/search/topbar/components/project_filter_spec.js
+++ b/spec/frontend/search/topbar/components/project_filter_spec.js
@@ -53,7 +53,7 @@ describe('ProjectFilter', () => {
     wrapper.destroy();
   });
 
-  const findSearchableDropdown = () => wrapper.find(SearchableDropdown);
+  const findSearchableDropdown = () => wrapper.findComponent(SearchableDropdown);
 
   describe('template', () => {
     beforeEach(() => {
diff --git a/spec/frontend/search_settings/components/search_settings_spec.js b/spec/frontend/search_settings/components/search_settings_spec.js
index 6e3ae72c45c..3f856968db6 100644
--- a/spec/frontend/search_settings/components/search_settings_spec.js
+++ b/spec/frontend/search_settings/components/search_settings_spec.js
@@ -46,8 +46,8 @@ describe('search_settings/components/search_settings.vue', () => {
   };
 
   const findMatchSiblingElement = () => document.querySelector(`[data-testid="sibling"]`);
-  const findSearchBox = () => wrapper.find(GlSearchBoxByType);
-  const findEmptyState = () => wrapper.find(GlEmptyState);
+  const findSearchBox = () => wrapper.findComponent(GlSearchBoxByType);
+  const findEmptyState = () => wrapper.findComponent(GlEmptyState);
   const findHideWhenEmpty = () => document.querySelector(`.${HIDE_WHEN_EMPTY_CLASS}`);
   const search = (term) => {
     findSearchBox().vm.$emit('input', term);
diff --git a/spec/frontend/security_configuration/components/training_provider_list_spec.js b/spec/frontend/security_configuration/components/training_provider_list_spec.js
index b6451af57d7..8f2b5383191 100644
--- a/spec/frontend/security_configuration/components/training_provider_list_spec.js
+++ b/spec/frontend/security_configuration/components/training_provider_list_spec.js
@@ -193,7 +193,7 @@ describe('TrainingProviderList component', () => {
         });
 
         it(`shows the learn more link for enabled card ${index}`, () => {
-          const learnMoreLink = findCards().at(index).find(GlLink);
+          const learnMoreLink = findCards().at(index).findComponent(GlLink);
           const tempLogo = TEMP_PROVIDER_URLS[name];
 
           if (tempLogo) {
@@ -224,7 +224,7 @@ describe('TrainingProviderList component', () => {
         });
 
         it('shows a info-tooltip that describes the purpose of a primary provider', () => {
-          const infoIcon = findPrimaryProviderRadios().at(index).find(GlIcon);
+          const infoIcon = findPrimaryProviderRadios().at(index).findComponent(GlIcon);
           const tooltip = getBinding(infoIcon.element, 'gl-tooltip');
 
           expect(infoIcon.props()).toMatchObject({
diff --git a/spec/frontend/self_monitor/components/self_monitor_form_spec.js b/spec/frontend/self_monitor/components/self_monitor_form_spec.js
index 89ad5a00a14..c690bbf1c57 100644
--- a/spec/frontend/self_monitor/components/self_monitor_form_spec.js
+++ b/spec/frontend/self_monitor/components/self_monitor_form_spec.js
@@ -42,7 +42,7 @@ describe('self monitor component', () => {
       it('renders as an expand button by default', () => {
         wrapper = shallowMount(SelfMonitor, { store });
 
-        const button = wrapper.find(GlButton);
+        const button = wrapper.findComponent(GlButton);
 
         expect(button.text()).toBe('Expand');
       });
@@ -79,7 +79,7 @@ describe('self monitor component', () => {
         wrapper = shallowMount(SelfMonitor, { store });
 
         expect(
-          wrapper.find({ ref: 'selfMonitoringFormText' }).find('a').attributes('href'),
+          wrapper.findComponent({ ref: 'selfMonitoringFormText' }).find('a').attributes('href'),
         ).toEqual(`${TEST_HOST}/instance-administrators-random/gitlab-self-monitoring`);
       });
 
diff --git a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
index c5fb590646d..344bbaa4a8b 100644
--- a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
+++ b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
@@ -51,11 +51,11 @@ describe('SetStatusModalWrapper', () => {
     });
   };
 
-  const findModal = () => wrapper.find(GlModal);
+  const findModal = () => wrapper.findComponent(GlModal);
   const findMessageField = () =>
     wrapper.findByPlaceholderText(SetStatusForm.i18n.statusMessagePlaceholder);
   const findClearStatusButton = () => wrapper.find('.js-clear-user-status-button');
-  const findAvailabilityCheckbox = () => wrapper.find(GlFormCheckbox);
+  const findAvailabilityCheckbox = () => wrapper.findComponent(GlFormCheckbox);
   const findClearStatusAtMessage = () => wrapper.find('[data-testid="clear-status-at-message"]');
   const getEmojiPicker = () => wrapper.findComponent(EmojiPickerStub);
 
diff --git a/spec/frontend/sidebar/assignee_title_spec.js b/spec/frontend/sidebar/assignee_title_spec.js
index e29e3d489a5..14a6bdbf907 100644
--- a/spec/frontend/sidebar/assignee_title_spec.js
+++ b/spec/frontend/sidebar/assignee_title_spec.js
@@ -85,7 +85,7 @@ describe('AssigneeTitle component', () => {
       editable: false,
     });
 
-    expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+    expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
   });
 
   it('renders spinner when loading', () => {
@@ -95,7 +95,7 @@ describe('AssigneeTitle component', () => {
       editable: false,
     });
 
-    expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+    expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
   });
 
   it('does not render edit link when not editable', () => {
diff --git a/spec/frontend/sidebar/assignees_spec.js b/spec/frontend/sidebar/assignees_spec.js
index c2aff456abb..7cf7fd33022 100644
--- a/spec/frontend/sidebar/assignees_spec.js
+++ b/spec/frontend/sidebar/assignees_spec.js
@@ -33,7 +33,7 @@ describe('Assignee component', () => {
     it('displays no assignee icon when collapsed', () => {
       createWrapper();
       const collapsedChildren = findCollapsedChildren();
-      const userIcon = collapsedChildren.at(0).find(GlIcon);
+      const userIcon = collapsedChildren.at(0).findComponent(GlIcon);
 
       expect(collapsedChildren.length).toBe(1);
       expect(collapsedChildren.at(0).attributes('aria-label')).toBe('None');
diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
index 8cde70ff8da..4764f3607bc 100644
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
@@ -46,7 +46,7 @@ describe('AssigneeAvatarLink component', () => {
   it('renders assignee avatar', () => {
     createComponent();
 
-    expect(wrapper.find(AssigneeAvatar).props()).toEqual(
+    expect(wrapper.findComponent(AssigneeAvatar).props()).toEqual(
       expect.objectContaining({
         issuableType: TEST_ISSUABLE_TYPE,
         user: userDataMock(),
diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
index 81ff51133bf..7e7d4921cfa 100644
--- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
@@ -21,7 +21,7 @@ describe('CollapsedAssigneeList component', () => {
     });
   }
 
-  const findNoUsersIcon = () => wrapper.find(GlIcon);
+  const findNoUsersIcon = () => wrapper.findComponent(GlIcon);
   const findAvatarCounter = () => wrapper.find('.avatar-counter');
   const findAssignees = () => wrapper.findAllComponents(CollapsedAssignee);
   const getTooltipTitle = () => wrapper.attributes('title');
diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js
index 2d5a3653631..4db95114b96 100644
--- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js
+++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js
@@ -34,7 +34,7 @@ describe('CollapsedAssignee assignee component', () => {
   it('has assignee avatar', () => {
     createComponent();
 
-    expect(wrapper.find(AssigneeAvatar).props()).toEqual({
+    expect(wrapper.findComponent(AssigneeAvatar).props()).toEqual({
       imgSize: 24,
       user: TEST_USER,
       issuableType: TEST_ISSUABLE_TYPE,
diff --git a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
index b902d7313fd..03c2e1a37a9 100644
--- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
@@ -46,7 +46,7 @@ describe('UncollapsedAssigneeList component', () => {
     });
 
     it('calls the AssigneeAvatarLink with the proper props', () => {
-      expect(wrapper.find(AssigneeAvatarLink).exists()).toBe(true);
+      expect(wrapper.findComponent(AssigneeAvatarLink).exists()).toBe(true);
     });
 
     it('Shows one user with avatar, username and author name', () => {
diff --git a/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js b/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js
index 699b2bbd0b1..69a8d645973 100644
--- a/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js
+++ b/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js
@@ -12,6 +12,6 @@ describe('CopyEmailToClipboard component', () => {
   });
 
   it('sets CopyableField `value` prop to issueEmailAddress', () => {
-    expect(wrapper.find(CopyableField).props('value')).toBe(mockIssueEmailAddress);
+    expect(wrapper.findComponent(CopyableField).props('value')).toBe(mockIssueEmailAddress);
   });
 });
diff --git a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
index 1e2173e2988..be48bb296d1 100644
--- a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
@@ -28,7 +28,7 @@ describe('Sidebar date Widget', () => {
 
   const findEditableItem = () => wrapper.findComponent(SidebarEditableItem);
   const findPopoverIcon = () => wrapper.find('[data-testid="inherit-date-popover"]');
-  const findDatePicker = () => wrapper.find(GlDatepicker);
+  const findDatePicker = () => wrapper.findComponent(GlDatepicker);
 
   const createComponent = ({
     dueDateQueryHandler = jest.fn().mockResolvedValue(issuableDueDateResponse()),
@@ -149,14 +149,14 @@ describe('Sidebar date Widget', () => {
       createComponent({ canInherit });
       await waitForPromises();
 
-      expect(wrapper.find(component).exists()).toBe(expected);
+      expect(wrapper.findComponent(component).exists()).toBe(expected);
     },
   );
 
   it('does not render SidebarInheritDate when canInherit is true and date is loading', async () => {
     createComponent({ canInherit: true });
 
-    expect(wrapper.find(SidebarInheritDate).exists()).toBe(false);
+    expect(wrapper.findComponent(SidebarInheritDate).exists()).toBe(false);
   });
 
   it('displays a flash message when query is rejected', async () => {
diff --git a/spec/frontend/sidebar/components/date/sidebar_formatted_date_spec.js b/spec/frontend/sidebar/components/date/sidebar_formatted_date_spec.js
index 1eda4ea977f..cbe01263dcd 100644
--- a/spec/frontend/sidebar/components/date/sidebar_formatted_date_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_formatted_date_spec.js
@@ -5,7 +5,7 @@ import SidebarFormattedDate from '~/sidebar/components/date/sidebar_formatted_da
 describe('SidebarFormattedDate', () => {
   let wrapper;
   const findFormattedDate = () => wrapper.find("[data-testid='sidebar-date-value']");
-  const findRemoveButton = () => wrapper.find(GlButton);
+  const findRemoveButton = () => wrapper.findComponent(GlButton);
 
   const createComponent = ({ hasDate = true } = {}) => {
     wrapper = shallowMount(SidebarFormattedDate, {
diff --git a/spec/frontend/sidebar/components/severity/severity_spec.js b/spec/frontend/sidebar/components/severity/severity_spec.js
index 1e4624e4dcd..2146155791e 100644
--- a/spec/frontend/sidebar/components/severity/severity_spec.js
+++ b/spec/frontend/sidebar/components/severity/severity_spec.js
@@ -21,7 +21,7 @@ describe('SeverityToken', () => {
     }
   });
 
-  const findIcon = () => wrapper.find(GlIcon);
+  const findIcon = () => wrapper.findComponent(GlIcon);
 
   it('renders severity token for each severity type', () => {
     Object.values(INCIDENT_SEVERITY).forEach((severity) => {
diff --git a/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js b/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js
index 83eb9a18597..9563679548c 100644
--- a/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js
+++ b/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js
@@ -59,7 +59,7 @@ describe('SidebarSeverity', () => {
   const findCriticalSeverityDropdownItem = () => wrapper.findComponent(GlDropdownItem);
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const findTooltip = () => wrapper.findComponent(GlTooltip);
-  const findCollapsedSeverity = () => wrapper.find({ ref: 'severity' });
+  const findCollapsedSeverity = () => wrapper.findComponent({ ref: 'severity' });
 
   describe('Severity widget', () => {
     it('renders severity dropdown and token', () => {
diff --git a/spec/frontend/sidebar/components/todo_toggle/sidebar_todo_widget_spec.js b/spec/frontend/sidebar/components/todo_toggle/sidebar_todo_widget_spec.js
index ea931782d1e..71140279adf 100644
--- a/spec/frontend/sidebar/components/todo_toggle/sidebar_todo_widget_spec.js
+++ b/spec/frontend/sidebar/components/todo_toggle/sidebar_todo_widget_spec.js
@@ -97,13 +97,13 @@ describe('Sidebar Todo Widget', () => {
     });
 
     it('shows add todo icon', () => {
-      expect(wrapper.find(GlIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlIcon).exists()).toBe(true);
 
-      expect(wrapper.find(GlIcon).props('name')).toBe('todo-add');
+      expect(wrapper.findComponent(GlIcon).props('name')).toBe('todo-add');
     });
 
     it('sets default tooltip title', () => {
-      expect(wrapper.find(GlButton).attributes('title')).toBe('Add a to do');
+      expect(wrapper.findComponent(GlButton).attributes('title')).toBe('Add a to do');
     });
 
     it('when user has a to do', async () => {
@@ -112,12 +112,12 @@ describe('Sidebar Todo Widget', () => {
       });
 
       await waitForPromises();
-      expect(wrapper.find(GlIcon).props('name')).toBe('todo-done');
-      expect(wrapper.find(GlButton).attributes('title')).toBe('Mark as done');
+      expect(wrapper.findComponent(GlIcon).props('name')).toBe('todo-done');
+      expect(wrapper.findComponent(GlButton).attributes('title')).toBe('Mark as done');
     });
 
     it('emits `todoUpdated` event on click on icon', async () => {
-      wrapper.find(GlIcon).vm.$emit('click', event);
+      wrapper.findComponent(GlIcon).vm.$emit('click', event);
 
       await nextTick();
       expect(wrapper.emitted('todoUpdated')).toEqual([[false]]);
diff --git a/spec/frontend/sidebar/issuable_assignees_spec.js b/spec/frontend/sidebar/issuable_assignees_spec.js
index dc59b68bbd4..1161fefcc64 100644
--- a/spec/frontend/sidebar/issuable_assignees_spec.js
+++ b/spec/frontend/sidebar/issuable_assignees_spec.js
@@ -17,7 +17,7 @@ describe('IssuableAssignees', () => {
       },
     });
   };
-  const findUncollapsedAssigneeList = () => wrapper.find(UncollapsedAssigneeList);
+  const findUncollapsedAssigneeList = () => wrapper.findComponent(UncollapsedAssigneeList);
   const findEmptyAssignee = () => wrapper.find('[data-testid="none"]');
 
   afterEach(() => {
diff --git a/spec/frontend/sidebar/lock/issuable_lock_form_spec.js b/spec/frontend/sidebar/lock/issuable_lock_form_spec.js
index 986ccaea4b6..8f825847cfc 100644
--- a/spec/frontend/sidebar/lock/issuable_lock_form_spec.js
+++ b/spec/frontend/sidebar/lock/issuable_lock_form_spec.js
@@ -26,7 +26,7 @@ describe('IssuableLockForm', () => {
   const findSidebarCollapseIcon = () => wrapper.find('[data-testid="sidebar-collapse-icon"]');
   const findLockStatus = () => wrapper.find('[data-testid="lock-status"]');
   const findEditLink = () => wrapper.find('[data-testid="edit-link"]');
-  const findEditForm = () => wrapper.find(EditForm);
+  const findEditForm = () => wrapper.findComponent(EditForm);
   const findSidebarLockStatusTooltip = () =>
     getBinding(findSidebarCollapseIcon().element, 'gl-tooltip');
 
diff --git a/spec/frontend/sidebar/participants_spec.js b/spec/frontend/sidebar/participants_spec.js
index 2517b625225..f7a626a189c 100644
--- a/spec/frontend/sidebar/participants_spec.js
+++ b/spec/frontend/sidebar/participants_spec.js
@@ -36,7 +36,7 @@ describe('Participants', () => {
         loading: true,
       });
 
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
 
     it('does not show loading spinner not loading', () => {
@@ -44,7 +44,7 @@ describe('Participants', () => {
         loading: false,
       });
 
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
     });
 
     it('shows participant count when given', () => {
@@ -73,7 +73,7 @@ describe('Participants', () => {
         loading: true,
       });
 
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
 
     it('when only showing visible participants, shows an avatar only for each participant under the limit', async () => {
diff --git a/spec/frontend/sidebar/reviewer_title_spec.js b/spec/frontend/sidebar/reviewer_title_spec.js
index 6b4eed5ad0f..68ecd62e4c6 100644
--- a/spec/frontend/sidebar/reviewer_title_spec.js
+++ b/spec/frontend/sidebar/reviewer_title_spec.js
@@ -47,7 +47,7 @@ describe('ReviewerTitle component', () => {
       editable: false,
     });
 
-    expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+    expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
   });
 
   it('renders spinner when loading', () => {
@@ -57,7 +57,7 @@ describe('ReviewerTitle component', () => {
       editable: false,
     });
 
-    expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+    expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
   });
 
   it('does not render edit link when not editable', () => {
diff --git a/spec/frontend/sidebar/reviewers_spec.js b/spec/frontend/sidebar/reviewers_spec.js
index 88bacc9b7f7..229f7ffbe04 100644
--- a/spec/frontend/sidebar/reviewers_spec.js
+++ b/spec/frontend/sidebar/reviewers_spec.js
@@ -43,7 +43,7 @@ describe('Reviewer component', () => {
     it('displays no reviewer icon when collapsed', () => {
       createWrapper();
       const collapsedChildren = findCollapsedChildren();
-      const userIcon = collapsedChildren.at(0).find(GlIcon);
+      const userIcon = collapsedChildren.at(0).findComponent(GlIcon);
 
       expect(collapsedChildren.length).toBe(1);
       expect(collapsedChildren.at(0).attributes('aria-label')).toBe('None');
diff --git a/spec/frontend/sidebar/sidebar_assignees_spec.js b/spec/frontend/sidebar/sidebar_assignees_spec.js
index 68d20060c37..2cb2425532b 100644
--- a/spec/frontend/sidebar/sidebar_assignees_spec.js
+++ b/spec/frontend/sidebar/sidebar_assignees_spec.js
@@ -73,19 +73,19 @@ describe('sidebar assignees', () => {
   it('hides assignees until fetched', async () => {
     createComponent();
 
-    expect(wrapper.find(Assigness).exists()).toBe(false);
+    expect(wrapper.findComponent(Assigness).exists()).toBe(false);
 
     wrapper.vm.store.isFetching.assignees = false;
 
     await nextTick();
-    expect(wrapper.find(Assigness).exists()).toBe(true);
+    expect(wrapper.findComponent(Assigness).exists()).toBe(true);
   });
 
   describe('when issuableType is issue', () => {
     it('finds AssigneesRealtime component', () => {
       createComponent();
 
-      expect(wrapper.find(AssigneesRealtime).exists()).toBe(true);
+      expect(wrapper.findComponent(AssigneesRealtime).exists()).toBe(true);
     });
   });
 
@@ -93,7 +93,7 @@ describe('sidebar assignees', () => {
     it('does not find AssigneesRealtime component', () => {
       createComponent({ issuableType: 'MR' });
 
-      expect(wrapper.find(AssigneesRealtime).exists()).toBe(false);
+      expect(wrapper.findComponent(AssigneesRealtime).exists()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/sidebar/subscriptions_spec.js b/spec/frontend/sidebar/subscriptions_spec.js
index 6ab8e1e0ebc..1a1aa370eef 100644
--- a/spec/frontend/sidebar/subscriptions_spec.js
+++ b/spec/frontend/sidebar/subscriptions_spec.js
@@ -108,7 +108,7 @@ describe('Subscriptions', () => {
       expect(wrapper.findByTestId('subscription-title').text()).toContain(
         subscribeDisabledDescription,
       );
-      expect(wrapper.find({ ref: 'tooltip' }).attributes('title')).toBe(
+      expect(wrapper.findComponent({ ref: 'tooltip' }).attributes('title')).toBe(
         subscribeDisabledDescription,
       );
     });
diff --git a/spec/frontend/sidebar/todo_spec.js b/spec/frontend/sidebar/todo_spec.js
index 5f696b237e0..8e6597bf80f 100644
--- a/spec/frontend/sidebar/todo_spec.js
+++ b/spec/frontend/sidebar/todo_spec.js
@@ -43,8 +43,8 @@ describe('SidebarTodo', () => {
     ({ isTodo, iconClass, label, icon }) => {
       createComponent({ isTodo });
 
-      expect(wrapper.find(GlIcon).classes().join(' ')).toStrictEqual(iconClass);
-      expect(wrapper.find(GlIcon).props('name')).toStrictEqual(icon);
+      expect(wrapper.findComponent(GlIcon).classes().join(' ')).toStrictEqual(iconClass);
+      expect(wrapper.findComponent(GlIcon).props('name')).toStrictEqual(icon);
       expect(wrapper.find('button').text()).toBe(label);
     },
   );
@@ -76,19 +76,19 @@ describe('SidebarTodo', () => {
     it('renders button icon when `collapsed` prop is `true`', () => {
       createComponent({ collapsed: true });
 
-      expect(wrapper.find(GlIcon).props('name')).toBe('todo-done');
+      expect(wrapper.findComponent(GlIcon).props('name')).toBe('todo-done');
     });
 
     it('renders loading icon when `isActionActive` prop is true', () => {
       createComponent({ isActionActive: true });
 
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
 
     it('hides button icon when `isActionActive` prop is true', () => {
       createComponent({ collapsed: true, isActionActive: true });
 
-      expect(wrapper.find(GlIcon).isVisible()).toBe(false);
+      expect(wrapper.findComponent(GlIcon).isVisible()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index cf897414ccb..ea9d696599d 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -206,7 +206,7 @@ describe('Snippet Edit app', () => {
     });
 
     it('should hide loader', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
     });
   });
 
@@ -237,7 +237,7 @@ describe('Snippet Edit app', () => {
           !titleHasErrors,
         );
 
-        expect(wrapper.find(SnippetBlobActionsEdit).props('isValid')).toEqual(
+        expect(wrapper.findComponent(SnippetBlobActionsEdit).props('isValid')).toEqual(
           !blobActionsHasErrors,
         );
       },
@@ -273,7 +273,7 @@ describe('Snippet Edit app', () => {
         selectedLevel: visibility,
       });
 
-      expect(wrapper.find(SnippetVisibilityEdit).props('value')).toBe(visibility);
+      expect(wrapper.findComponent(SnippetVisibilityEdit).props('value')).toBe(visibility);
     });
 
     describe('form submission handling', () => {
diff --git a/spec/frontend/snippets/components/embed_dropdown_spec.js b/spec/frontend/snippets/components/embed_dropdown_spec.js
index 389b1c618a3..ed5ea6cab8a 100644
--- a/spec/frontend/snippets/components/embed_dropdown_spec.js
+++ b/spec/frontend/snippets/components/embed_dropdown_spec.js
@@ -36,7 +36,7 @@ describe('snippets/components/embed_dropdown', () => {
 
         sections.push(current);
       } else {
-        const value = x.find(GlFormInputGroup).props('value');
+        const value = x.findComponent(GlFormInputGroup).props('value');
         const copyValue = x.find('button[title="Copy"]').attributes('data-clipboard-text');
 
         Object.assign(current, {
diff --git a/spec/frontend/snippets/components/snippet_blob_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_edit_spec.js
index 7ea27864519..f5f86167f2b 100644
--- a/spec/frontend/snippets/components/snippet_blob_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_edit_spec.js
@@ -46,9 +46,9 @@ describe('Snippet Blob Edit component', () => {
     });
   };
 
-  const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
-  const findHeader = () => wrapper.find(BlobHeaderEdit);
-  const findContent = () => wrapper.find(SourceEditor);
+  const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
+  const findHeader = () => wrapper.findComponent(BlobHeaderEdit);
+  const findContent = () => wrapper.findComponent(SourceEditor);
   const getLastUpdatedArgs = () => {
     const event = wrapper.emitted()['blob-updated'];
 
diff --git a/spec/frontend/snippets/components/snippet_blob_view_spec.js b/spec/frontend/snippets/components/snippet_blob_view_spec.js
index aa31377f390..74671c3fc1d 100644
--- a/spec/frontend/snippets/components/snippet_blob_view_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_view_spec.js
@@ -69,13 +69,13 @@ describe('Blob Embeddable', () => {
   describe('rendering', () => {
     it('renders correct components', () => {
       createComponent();
-      expect(wrapper.find(BlobHeader).exists()).toBe(true);
-      expect(wrapper.find(BlobContent).exists()).toBe(true);
+      expect(wrapper.findComponent(BlobHeader).exists()).toBe(true);
+      expect(wrapper.findComponent(BlobContent).exists()).toBe(true);
     });
 
     it('sets simple viewer correctly', () => {
       createComponent();
-      expect(wrapper.find(SimpleViewer).exists()).toBe(true);
+      expect(wrapper.findComponent(SimpleViewer).exists()).toBe(true);
     });
 
     it('sets rich viewer correctly', () => {
@@ -83,20 +83,20 @@ describe('Blob Embeddable', () => {
       createComponent({
         data,
       });
-      expect(wrapper.find(RichViewer).exists()).toBe(true);
+      expect(wrapper.findComponent(RichViewer).exists()).toBe(true);
     });
 
     it('correctly switches viewer type', async () => {
       createComponent();
-      expect(wrapper.find(SimpleViewer).exists()).toBe(true);
+      expect(wrapper.findComponent(SimpleViewer).exists()).toBe(true);
 
       wrapper.vm.switchViewer(RichViewerMock.type);
 
       await nextTick();
-      expect(wrapper.find(RichViewer).exists()).toBe(true);
+      expect(wrapper.findComponent(RichViewer).exists()).toBe(true);
       await wrapper.vm.switchViewer(SimpleViewerMock.type);
 
-      expect(wrapper.find(SimpleViewer).exists()).toBe(true);
+      expect(wrapper.findComponent(SimpleViewer).exists()).toBe(true);
     });
 
     it('passes information about render error down to blob header', () => {
@@ -110,7 +110,7 @@ describe('Blob Embeddable', () => {
         },
       });
 
-      expect(wrapper.find(BlobHeader).props('hasRenderError')).toBe(true);
+      expect(wrapper.findComponent(BlobHeader).props('hasRenderError')).toBe(true);
     });
 
     describe('bob content in multi-file scenario', () => {
@@ -161,7 +161,7 @@ describe('Blob Embeddable', () => {
 
           await nextTick();
 
-          const findContent = () => wrapper.find(BlobContent);
+          const findContent = () => wrapper.findComponent(BlobContent);
 
           expect(findContent().props('content')).toBe(expectedContent);
         },
@@ -183,7 +183,7 @@ describe('Blob Embeddable', () => {
         });
 
         expect(wrapper.vm.activeViewerType).toBe(SimpleViewerMock.type);
-        expect(wrapper.find(SimpleViewer).exists()).toBe(true);
+        expect(wrapper.findComponent(SimpleViewer).exists()).toBe(true);
       });
 
       describe('switchViewer()', () => {
@@ -194,11 +194,11 @@ describe('Blob Embeddable', () => {
 
           await nextTick();
           expect(wrapper.vm.activeViewerType).toBe(RichViewerMock.type);
-          expect(wrapper.find(RichViewer).exists()).toBe(true);
+          expect(wrapper.findComponent(RichViewer).exists()).toBe(true);
 
           await wrapper.vm.switchViewer(SimpleViewerMock.type);
           expect(wrapper.vm.activeViewerType).toBe(SimpleViewerMock.type);
-          expect(wrapper.find(SimpleViewer).exists()).toBe(true);
+          expect(wrapper.findComponent(SimpleViewer).exists()).toBe(true);
         });
       });
     });
@@ -206,7 +206,7 @@ describe('Blob Embeddable', () => {
 
   describe('functionality', () => {
     describe('render error', () => {
-      const findContentEl = () => wrapper.find(BlobContent);
+      const findContentEl = () => wrapper.findComponent(BlobContent);
 
       it('correctly sets blob on the blob-content-error component', () => {
         createComponent();
diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js
index b750225a383..3d64839a408 100644
--- a/spec/frontend/snippets/components/snippet_header_spec.js
+++ b/spec/frontend/snippets/components/snippet_header_spec.js
@@ -311,7 +311,7 @@ describe('Snippet header component', () => {
 
   it('renders modal for deletion of a snippet', () => {
     createComponent();
-    expect(wrapper.find(GlModal).exists()).toBe(true);
+    expect(wrapper.findComponent(GlModal).exists()).toBe(true);
   });
 
   it.each`
diff --git a/spec/frontend/snippets/components/snippet_title_spec.js b/spec/frontend/snippets/components/snippet_title_spec.js
index 48fb51ce703..7c40735d64e 100644
--- a/spec/frontend/snippets/components/snippet_title_spec.js
+++ b/spec/frontend/snippets/components/snippet_title_spec.js
@@ -39,12 +39,12 @@ describe('Snippet header component', () => {
     createComponent();
 
     expect(wrapper.text().trim()).toContain(title);
-    expect(wrapper.find(SnippetDescription).props('description')).toBe(descriptionHtml);
+    expect(wrapper.findComponent(SnippetDescription).props('description')).toBe(descriptionHtml);
   });
 
   it('does not render recent changes time stamp if there were no updates', () => {
     createComponent();
-    expect(wrapper.find(GlSprintf).exists()).toBe(false);
+    expect(wrapper.findComponent(GlSprintf).exists()).toBe(false);
   });
 
   it('does not render recent changes time stamp if the time for creation and updates match', () => {
@@ -57,7 +57,7 @@ describe('Snippet header component', () => {
     });
     createComponent({ props });
 
-    expect(wrapper.find(GlSprintf).exists()).toBe(false);
+    expect(wrapper.findComponent(GlSprintf).exists()).toBe(false);
   });
 
   it('renders translated string with most recent changes timestamp if changes were made', () => {
@@ -70,6 +70,6 @@ describe('Snippet header component', () => {
     });
     createComponent({ props });
 
-    expect(wrapper.find(GlSprintf).exists()).toBe(true);
+    expect(wrapper.findComponent(GlSprintf).exists()).toBe(true);
   });
 });
diff --git a/spec/frontend/snippets/components/snippet_visibility_edit_spec.js b/spec/frontend/snippets/components/snippet_visibility_edit_spec.js
index 2d043a5caba..29eb002ef4a 100644
--- a/spec/frontend/snippets/components/snippet_visibility_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_visibility_edit_spec.js
@@ -39,13 +39,13 @@ describe('Snippet Visibility Edit component', () => {
     });
   }
 
-  const findLink = () => wrapper.find('label').find(GlLink);
-  const findRadios = () => wrapper.find(GlFormRadioGroup).findAllComponents(GlFormRadio);
+  const findLink = () => wrapper.find('label').findComponent(GlLink);
+  const findRadios = () => wrapper.findComponent(GlFormRadioGroup).findAllComponents(GlFormRadio);
   const findRadiosData = () =>
     findRadios().wrappers.map((x) => {
       return {
         value: x.find('input').attributes('value'),
-        icon: x.find(GlIcon).props('name'),
+        icon: x.findComponent(GlIcon).props('name'),
         description: x.find('.help-text').text(),
         text: x.find('.js-visibility-option').text(),
       };
@@ -147,7 +147,7 @@ describe('Snippet Visibility Edit component', () => {
 
       createComponent({ propsData: { value } });
 
-      expect(wrapper.find(GlFormRadioGroup).attributes('checked')).toBe(value);
+      expect(wrapper.findComponent(GlFormRadioGroup).attributes('checked')).toBe(value);
     });
   });
 });
diff --git a/spec/frontend/terms/components/app_spec.js b/spec/frontend/terms/components/app_spec.js
index ee78b35843a..f1dbc004da8 100644
--- a/spec/frontend/terms/components/app_spec.js
+++ b/spec/frontend/terms/components/app_spec.js
@@ -74,7 +74,7 @@ describe('TermsApp', () => {
 
       expect(findButton(defaultProvide.paths.accept).attributes('disabled')).toBe('disabled');
 
-      wrapper.find(GlIntersectionObserver).vm.$emit('appear');
+      wrapper.findComponent(GlIntersectionObserver).vm.$emit('appear');
 
       await nextTick();
 
diff --git a/spec/frontend/terraform/components/states_table_spec.js b/spec/frontend/terraform/components/states_table_spec.js
index 12a44452717..0b3b169891b 100644
--- a/spec/frontend/terraform/components/states_table_spec.js
+++ b/spec/frontend/terraform/components/states_table_spec.js
@@ -160,8 +160,8 @@ describe('StatesTable', () => {
       const state = states.at(lineNumber);
 
       expect(state.text()).toContain(name);
-      expect(state.find(GlBadge).exists()).toBe(hasBadge);
-      expect(state.find(GlLoadingIcon).exists()).toBe(loading);
+      expect(state.findComponent(GlBadge).exists()).toBe(hasBadge);
+      expect(state.findComponent(GlLoadingIcon).exists()).toBe(loading);
 
       if (hasBadge) {
         const badge = wrapper.findByTestId(`state-badge-${name}`);
@@ -198,7 +198,7 @@ describe('StatesTable', () => {
       const states = wrapper.findAll('[data-testid="terraform-states-table-pipeline"]');
       const state = states.at(lineNumber);
 
-      expect(state.find(GlTooltip).exists()).toBe(toolTipAdded);
+      expect(state.findComponent(GlTooltip).exists()).toBe(toolTipAdded);
       expect(state.text()).toMatchInterpolatedText(pipelineText);
     },
   );
diff --git a/spec/frontend/terraform/components/terraform_list_spec.js b/spec/frontend/terraform/components/terraform_list_spec.js
index cfd82768098..580951e799a 100644
--- a/spec/frontend/terraform/components/terraform_list_spec.js
+++ b/spec/frontend/terraform/components/terraform_list_spec.js
@@ -57,11 +57,11 @@ describe('TerraformList', () => {
     });
   };
 
-  const findBadge = () => wrapper.find(GlBadge);
-  const findEmptyState = () => wrapper.find(EmptyState);
-  const findPaginationButtons = () => wrapper.find(GlKeysetPagination);
-  const findStatesTable = () => wrapper.find(StatesTable);
-  const findTab = () => wrapper.find(GlTab);
+  const findBadge = () => wrapper.findComponent(GlBadge);
+  const findEmptyState = () => wrapper.findComponent(EmptyState);
+  const findPaginationButtons = () => wrapper.findComponent(GlKeysetPagination);
+  const findStatesTable = () => wrapper.findComponent(StatesTable);
+  const findTab = () => wrapper.findComponent(GlTab);
 
   afterEach(() => {
     wrapper.destroy();
@@ -182,7 +182,7 @@ describe('TerraformList', () => {
     });
 
     it('displays an alert message', () => {
-      expect(wrapper.find(GlAlert).exists()).toBe(true);
+      expect(wrapper.findComponent(GlAlert).exists()).toBe(true);
     });
   });
 
@@ -195,7 +195,7 @@ describe('TerraformList', () => {
     });
 
     it('displays a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/toggles/index_spec.js b/spec/frontend/toggles/index_spec.js
index 19c4d6f1f1d..f8c43e0ad0c 100644
--- a/spec/frontend/toggles/index_spec.js
+++ b/spec/frontend/toggles/index_spec.js
@@ -83,12 +83,12 @@ describe('toggles/index.js', () => {
 
         expect(listener).toHaveBeenCalledTimes(0);
 
-        wrapper.find(GlToggle).vm.$emit(event, true);
+        wrapper.findComponent(GlToggle).vm.$emit(event, true);
 
         expect(listener).toHaveBeenCalledTimes(1);
         expect(listener).toHaveBeenLastCalledWith(true);
 
-        wrapper.find(GlToggle).vm.$emit(event, false);
+        wrapper.findComponent(GlToggle).vm.$emit(event, false);
 
         expect(listener).toHaveBeenCalledTimes(2);
         expect(listener).toHaveBeenLastCalledWith(false);
diff --git a/spec/frontend/tooltips/components/tooltips_spec.js b/spec/frontend/tooltips/components/tooltips_spec.js
index 998bb2a9ea2..d5a63a99601 100644
--- a/spec/frontend/tooltips/components/tooltips_spec.js
+++ b/spec/frontend/tooltips/components/tooltips_spec.js
@@ -49,7 +49,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).props('target')).toBe(target);
+      expect(wrapper.findComponent(GlTooltip).props('target')).toBe(target);
     });
 
     it('does not attach a tooltip to a target with empty title', async () => {
@@ -59,7 +59,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).exists()).toBe(false);
+      expect(wrapper.findComponent(GlTooltip).exists()).toBe(false);
     });
 
     it('does not attach a tooltip twice to the same element', async () => {
@@ -76,7 +76,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).text()).toBe(target.getAttribute('title'));
+      expect(wrapper.findComponent(GlTooltip).text()).toBe(target.getAttribute('title'));
     });
 
     it('supports HTML content', async () => {
@@ -88,7 +88,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).html()).toContain(target.getAttribute('title'));
+      expect(wrapper.findComponent(GlTooltip).html()).toContain(target.getAttribute('title'));
     });
 
     it('sets the configuration values passed in the config object', async () => {
@@ -96,7 +96,7 @@ describe('tooltips/components/tooltips.vue', () => {
       target = createTooltipTarget();
       wrapper.vm.addTooltips([target], config);
       await nextTick();
-      expect(wrapper.find(GlTooltip).props()).toMatchObject(config);
+      expect(wrapper.findComponent(GlTooltip).props()).toMatchObject(config);
     });
 
     it.each`
@@ -113,7 +113,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
         await nextTick();
 
-        expect(wrapper.find(GlTooltip).props(prop)).toBe(value);
+        expect(wrapper.findComponent(GlTooltip).props(prop)).toBe(value);
       },
     );
   });
@@ -180,7 +180,7 @@ describe('tooltips/components/tooltips.vue', () => {
 
       wrapper.vm.triggerEvent(target, event);
 
-      expect(wrapper.find(GlTooltip).emitted(event)).toHaveLength(1);
+      expect(wrapper.findComponent(GlTooltip).emitted(event)).toHaveLength(1);
     });
   });
 
@@ -198,14 +198,14 @@ describe('tooltips/components/tooltips.vue', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).text()).toBe(currentTitle);
+      expect(wrapper.findComponent(GlTooltip).text()).toBe(currentTitle);
 
       target.setAttribute('title', newTitle);
       wrapper.vm.fixTitle(target);
 
       await nextTick();
 
-      expect(wrapper.find(GlTooltip).text()).toBe(newTitle);
+      expect(wrapper.findComponent(GlTooltip).text()).toBe(newTitle);
     });
   });
 
diff --git a/spec/frontend/user_lists/components/edit_user_list_spec.js b/spec/frontend/user_lists/components/edit_user_list_spec.js
index 941c8244247..5f067d9de3c 100644
--- a/spec/frontend/user_lists/components/edit_user_list_spec.js
+++ b/spec/frontend/user_lists/components/edit_user_list_spec.js
@@ -47,7 +47,7 @@ describe('user_lists/components/edit_user_list', () => {
     });
 
     it('should show a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 
@@ -60,7 +60,7 @@ describe('user_lists/components/edit_user_list', () => {
       factory();
       await waitForPromises();
 
-      alert = wrapper.find(GlAlert);
+      alert = wrapper.findComponent(GlAlert);
     });
 
     it('should show a flash with the error respopnse', () => {
@@ -72,7 +72,7 @@ describe('user_lists/components/edit_user_list', () => {
     });
 
     it('should not show a user list form', () => {
-      expect(wrapper.find(UserListForm).exists()).toBe(false);
+      expect(wrapper.findComponent(UserListForm).exists()).toBe(false);
     });
   });
 
@@ -129,7 +129,7 @@ describe('user_lists/components/edit_user_list', () => {
         clickSave();
         await waitForPromises();
 
-        alert = wrapper.find(GlAlert);
+        alert = wrapper.findComponent(GlAlert);
       });
 
       it('should show a flash with the error respopnse', () => {
diff --git a/spec/frontend/user_lists/components/new_user_list_spec.js b/spec/frontend/user_lists/components/new_user_list_spec.js
index ace4a284347..8683cf2463c 100644
--- a/spec/frontend/user_lists/components/new_user_list_spec.js
+++ b/spec/frontend/user_lists/components/new_user_list_spec.js
@@ -72,7 +72,7 @@ describe('user_lists/components/new_user_list', () => {
 
         await waitForPromises();
 
-        alert = wrapper.find(GlAlert);
+        alert = wrapper.findComponent(GlAlert);
       });
 
       it('should show a flash with the error respopnse', () => {
diff --git a/spec/frontend/user_lists/components/user_list_spec.js b/spec/frontend/user_lists/components/user_list_spec.js
index f126c733dd5..e02862cad2b 100644
--- a/spec/frontend/user_lists/components/user_list_spec.js
+++ b/spec/frontend/user_lists/components/user_list_spec.js
@@ -50,7 +50,7 @@ describe('User List', () => {
     });
 
     it('shows a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 
@@ -157,7 +157,7 @@ describe('User List', () => {
   });
 
   describe('error', () => {
-    const findAlert = () => wrapper.find(GlAlert);
+    const findAlert = () => wrapper.findComponent(GlAlert);
 
     beforeEach(async () => {
       Api.fetchFeatureFlagUserList.mockRejectedValue();
@@ -190,7 +190,7 @@ describe('User List', () => {
     });
 
     it('displays an empty state', () => {
-      expect(wrapper.find(GlEmptyState).exists()).toBe(true);
+      expect(wrapper.findComponent(GlEmptyState).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/user_lists/components/user_lists_table_spec.js b/spec/frontend/user_lists/components/user_lists_table_spec.js
index fb5093eb065..3324b040b86 100644
--- a/spec/frontend/user_lists/components/user_lists_table_spec.js
+++ b/spec/frontend/user_lists/components/user_lists_table_spec.js
@@ -59,7 +59,7 @@ describe('User Lists Table', () => {
 
   describe('delete button', () => {
     it('should display the confirmation modal', async () => {
-      const modal = wrapper.find(GlModal);
+      const modal = wrapper.findComponent(GlModal);
 
       wrapper.find('[data-testid="delete-user-list"]').trigger('click');
 
@@ -73,7 +73,7 @@ describe('User Lists Table', () => {
     let modal;
 
     beforeEach(async () => {
-      modal = wrapper.find(GlModal);
+      modal = wrapper.findComponent(GlModal);
 
       wrapper.find('button').trigger('click');
 
diff --git a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
index 05cd1bb5b3d..612fc2112d0 100644
--- a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
@@ -49,7 +49,7 @@ describe('MRWidget approvals', () => {
     });
   };
 
-  const findAction = () => wrapper.find(GlButton);
+  const findAction = () => wrapper.findComponent(GlButton);
   const findActionData = () => {
     const action = findAction();
 
@@ -61,8 +61,8 @@ describe('MRWidget approvals', () => {
           text: action.text(),
         };
   };
-  const findSummary = () => wrapper.find(ApprovalsSummary);
-  const findOptionalSummary = () => wrapper.find(ApprovalsSummaryOptional);
+  const findSummary = () => wrapper.findComponent(ApprovalsSummary);
+  const findOptionalSummary = () => wrapper.findComponent(ApprovalsSummaryOptional);
   const findInvalidRules = () => wrapper.find('[data-testid="invalid-rules"]');
 
   beforeEach(() => {
diff --git a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_optional_spec.js b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_optional_spec.js
index 65cafc647e0..e6fb0495947 100644
--- a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_optional_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_optional_spec.js
@@ -18,7 +18,7 @@ describe('MRWidget approvals summary optional', () => {
     wrapper = null;
   });
 
-  const findHelpLink = () => wrapper.find(GlLink);
+  const findHelpLink = () => wrapper.findComponent(GlLink);
 
   describe('when can approve', () => {
     beforeEach(() => {
diff --git a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
index c2606346292..f4234083346 100644
--- a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
@@ -29,7 +29,7 @@ describe('MRWidget approvals summary', () => {
     });
   };
 
-  const findAvatars = () => wrapper.find(UserAvatarList);
+  const findAvatars = () => wrapper.findComponent(UserAvatarList);
 
   afterEach(() => {
     wrapper.destroy();
@@ -136,7 +136,7 @@ describe('MRWidget approvals summary', () => {
     });
 
     it('does not render avatar list', () => {
-      expect(wrapper.find(UserAvatarList).exists()).toBe(false);
+      expect(wrapper.findComponent(UserAvatarList).exists()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
index e2386bc7f2b..73fa4b7b08f 100644
--- a/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
@@ -60,7 +60,7 @@ describe('Merge Requests Artifacts list app', () => {
     });
 
     it('renders a loading icon', () => {
-      const loadingIcon = wrapper.find(GlLoadingIcon);
+      const loadingIcon = wrapper.findComponent(GlLoadingIcon);
       expect(loadingIcon.exists()).toBe(true);
     });
 
diff --git a/spec/frontend/vue_merge_request_widget/components/artifacts_list_spec.js b/spec/frontend/vue_merge_request_widget/components/artifacts_list_spec.js
index d519ad2cdb0..b7bf72cd215 100644
--- a/spec/frontend/vue_merge_request_widget/components/artifacts_list_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/artifacts_list_spec.js
@@ -31,11 +31,11 @@ describe('Artifacts List', () => {
   });
 
   it('renders link for the artifact', () => {
-    expect(wrapper.find(GlLink).attributes('href')).toEqual(data.artifacts[0].url);
+    expect(wrapper.findComponent(GlLink).attributes('href')).toEqual(data.artifacts[0].url);
   });
 
   it('renders artifact name', () => {
-    expect(wrapper.find(GlLink).text()).toEqual(data.artifacts[0].text);
+    expect(wrapper.findComponent(GlLink).text()).toEqual(data.artifacts[0].text);
   });
 
   it('renders job url', () => {
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_collapsible_extension_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_collapsible_extension_spec.js
index 01fbcb2154f..c253dc63f23 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_collapsible_extension_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_collapsible_extension_spec.js
@@ -23,7 +23,7 @@ describe('Merge Request Collapsible Extension', () => {
 
   const findTitle = () => wrapper.find('[data-testid="mr-collapsible-title"]');
   const findErrorMessage = () => wrapper.find('.js-error-state');
-  const findIcon = () => wrapper.find(GlIcon);
+  const findIcon = () => wrapper.findComponent(GlIcon);
 
   afterEach(() => {
     wrapper.destroy();
@@ -77,7 +77,7 @@ describe('Merge Request Collapsible Extension', () => {
     });
 
     it('renders loading spinner', () => {
-      expect(wrapper.find(GlLoadingIcon).isVisible()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).isVisible()).toBe(true);
     });
   });
 
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_author_time_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_author_time_spec.js
index 8fd93809e01..90a29d15488 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_author_time_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_author_time_spec.js
@@ -32,7 +32,9 @@ describe('MrWidgetAuthorTime', () => {
   });
 
   it('renders author', () => {
-    expect(wrapper.find(MrWidgetAuthor).props('author')).toStrictEqual(defaultProps.author);
+    expect(wrapper.findComponent(MrWidgetAuthor).props('author')).toStrictEqual(
+      defaultProps.author,
+    );
   });
 
   it('renders provided time', () => {
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
index 631aef412a6..8eaed998eb5 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
@@ -6,8 +6,8 @@ import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_widge
 describe('MrWidgetExpanableSection', () => {
   let wrapper;
 
-  const findButton = () => wrapper.find(GlButton);
-  const findCollapse = () => wrapper.find(GlCollapse);
+  const findButton = () => wrapper.findComponent(GlButton);
+  const findCollapse = () => wrapper.findComponent(GlCollapse);
 
   beforeEach(() => {
     wrapper = shallowMount(MrCollapsibleSection, {
@@ -19,7 +19,7 @@ describe('MrWidgetExpanableSection', () => {
   });
 
   it('renders Icon', () => {
-    expect(wrapper.find(GlIcon).exists()).toBe(true);
+    expect(wrapper.findComponent(GlIcon).exists()).toBe(true);
   });
 
   it('renders header slot', () => {
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_icon_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_icon_spec.js
index ebd10f31fa7..6a9b019fb4f 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_icon_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_icon_spec.js
@@ -21,6 +21,6 @@ describe('MrWidgetIcon', () => {
 
   it('renders icon and container', () => {
     expect(wrapper.element.className).toContain('circle-icon-container');
-    expect(wrapper.find(GlIcon).props('name')).toEqual(TEST_ICON);
+    expect(wrapper.findComponent(GlIcon).props('name')).toEqual(TEST_ICON);
   });
 });
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_container_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_container_spec.js
index efe2bf75c3f..c3f6331e560 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_container_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_container_spec.js
@@ -41,8 +41,8 @@ describe('MrWidgetPipelineContainer', () => {
     });
 
     it('renders pipeline', () => {
-      expect(wrapper.find(MrWidgetPipeline).exists()).toBe(true);
-      expect(wrapper.find(MrWidgetPipeline).props()).toMatchObject({
+      expect(wrapper.findComponent(MrWidgetPipeline).exists()).toBe(true);
+      expect(wrapper.findComponent(MrWidgetPipeline).props()).toMatchObject({
         pipeline: mockStore.pipeline,
         pipelineCoverageDelta: mockStore.pipelineCoverageDelta,
         ciStatus: mockStore.ciStatus,
@@ -82,9 +82,9 @@ describe('MrWidgetPipelineContainer', () => {
     });
 
     it('renders pipeline', () => {
-      expect(wrapper.find(MrWidgetPipeline).exists()).toBe(true);
+      expect(wrapper.findComponent(MrWidgetPipeline).exists()).toBe(true);
       expect(findCIErrorMessage().exists()).toBe(false);
-      expect(wrapper.find(MrWidgetPipeline).props()).toMatchObject({
+      expect(wrapper.findComponent(MrWidgetPipeline).props()).toMatchObject({
         pipeline: mockStore.mergePipeline,
         pipelineCoverageDelta: mockStore.pipelineCoverageDelta,
         ciStatus: mockStore.mergePipeline.details.status.text,
@@ -102,7 +102,7 @@ describe('MrWidgetPipelineContainer', () => {
           targetBranch: 'Foo<script>alert("XSS")</script>',
         },
       });
-      expect(wrapper.find(MrWidgetPipeline).props().sourceBranchLink).toBe('Foo');
+      expect(wrapper.findComponent(MrWidgetPipeline).props().sourceBranchLink).toBe('Foo');
     });
 
     it('renders deployments', () => {
@@ -125,7 +125,7 @@ describe('MrWidgetPipelineContainer', () => {
     it('renders the artifacts app', () => {
       factory();
 
-      expect(wrapper.find(ArtifactsApp).isVisible()).toBe(true);
+      expect(wrapper.findComponent(ArtifactsApp).isVisible()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_suggest_pipeline_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_suggest_pipeline_spec.js
index d6c67dab381..73358edee78 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_suggest_pipeline_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_suggest_pipeline_spec.js
@@ -57,7 +57,7 @@ describe('MRWidgetSuggestPipeline', () => {
       });
 
       it('renders widget icon', () => {
-        const icon = wrapper.find(MrWidgetIcon);
+        const icon = wrapper.findComponent(MrWidgetIcon);
 
         expect(icon.exists()).toBe(true);
         expect(icon.props()).toEqual(
@@ -115,7 +115,7 @@ describe('MRWidgetSuggestPipeline', () => {
     });
 
     describe('dismissible', () => {
-      const findDismissContainer = () => wrapper.find(dismissibleContainer);
+      const findDismissContainer = () => wrapper.findComponent(dismissibleContainer);
 
       beforeEach(() => {
         wrapper = shallowMount(suggestPipelineComponent, { propsData: suggestProps });
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
index 9320e733636..398a3912882 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
@@ -7,7 +7,7 @@ import eventHub from '~/vue_merge_request_widget/event_hub';
 describe('MRWidgetAutoMergeFailed', () => {
   let wrapper;
   const mergeError = 'This is the merge error';
-  const findButton = () => wrapper.find(GlButton);
+  const findButton = () => wrapper.findComponent(GlButton);
 
   const createComponent = (props = {}, mergeRequestWidgetGraphql = false) => {
     wrapper = mount(AutoMergeFailedComponent, {
@@ -61,7 +61,7 @@ describe('MRWidgetAutoMergeFailed', () => {
         await nextTick();
 
         expect(findButton().attributes('disabled')).toBe('disabled');
-        expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+        expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
       });
     });
   });
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
index 0aced0eea65..f8ce947d778 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -110,11 +110,11 @@ const createComponent = (
   });
 };
 
-const findCheckboxElement = () => wrapper.find(SquashBeforeMerge);
+const findCheckboxElement = () => wrapper.findComponent(SquashBeforeMerge);
 const findCommitEditElements = () => wrapper.findAllComponents(CommitEdit);
-const findCommitDropdownElement = () => wrapper.find(CommitMessageDropdown);
+const findCommitDropdownElement = () => wrapper.findComponent(CommitMessageDropdown);
 const findFirstCommitEditLabel = () => findCommitEditElements().at(0).props('label');
-const findTipLink = () => wrapper.find(GlSprintf);
+const findTipLink = () => wrapper.findComponent(GlSprintf);
 const findCommitEditWithInputId = (inputId) =>
   findCommitEditElements().wrappers.find((x) => x.props('inputId') === inputId);
 const findMergeCommitMessage = () => findCommitEditWithInputId('merge-message-edit').props('value');
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_squash_before_merge_spec.js
index 6ea2e8675d3..c839fa17fe5 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_squash_before_merge_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_squash_before_merge_spec.js
@@ -18,7 +18,7 @@ describe('Squash before merge component', () => {
     wrapper.destroy();
   });
 
-  const findCheckbox = () => wrapper.find(GlFormCheckbox);
+  const findCheckbox = () => wrapper.findComponent(GlFormCheckbox);
 
   describe('checkbox', () => {
     it('is unchecked if passed value prop is false', () => {
diff --git a/spec/frontend/vue_merge_request_widget/components/terraform/mr_widget_terraform_container_spec.js b/spec/frontend/vue_merge_request_widget/components/terraform/mr_widget_terraform_container_spec.js
index 7a868eb8cc9..db10236e5de 100644
--- a/spec/frontend/vue_merge_request_widget/components/terraform/mr_widget_terraform_container_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/terraform/mr_widget_terraform_container_spec.js
@@ -53,7 +53,7 @@ describe('MrWidgetTerraformConainer', () => {
 
     it('diplays loading skeleton', () => {
       expect(wrapper.findComponent(GlSkeletonLoader).exists()).toBe(true);
-      expect(wrapper.find(MrWidgetExpanableSection).exists()).toBe(false);
+      expect(wrapper.findComponent(MrWidgetExpanableSection).exists()).toBe(false);
     });
   });
 
@@ -65,7 +65,7 @@ describe('MrWidgetTerraformConainer', () => {
 
     it('displays terraform content', () => {
       expect(wrapper.findComponent(GlSkeletonLoader).exists()).toBe(false);
-      expect(wrapper.find(MrWidgetExpanableSection).exists()).toBe(true);
+      expect(wrapper.findComponent(MrWidgetExpanableSection).exists()).toBe(true);
       expect(findPlans()).toEqual(Object.values(plans));
     });
 
diff --git a/spec/frontend/vue_merge_request_widget/deployment/deployment_action_button_spec.js b/spec/frontend/vue_merge_request_widget/deployment/deployment_action_button_spec.js
index 7e7438bcc0f..1bad5dacefa 100644
--- a/spec/frontend/vue_merge_request_widget/deployment/deployment_action_button_spec.js
+++ b/spec/frontend/vue_merge_request_widget/deployment/deployment_action_button_spec.js
@@ -41,7 +41,7 @@ describe('Deployment action button', () => {
     });
 
     it('renders prop icon correctly', () => {
-      expect(wrapper.find(GlIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlIcon).exists()).toBe(true);
     });
   });
 
@@ -59,7 +59,7 @@ describe('Deployment action button', () => {
     });
 
     it('renders slot and icon prop correctly', () => {
-      expect(wrapper.find(GlIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlIcon).exists()).toBe(true);
       expect(wrapper.text()).toContain(actionButtonMocks[DEPLOYING].toString());
     });
   });
@@ -75,8 +75,8 @@ describe('Deployment action button', () => {
     });
 
     it('is disabled and shows the loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
-      expect(wrapper.find(GlButton).props('disabled')).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlButton).props('disabled')).toBe(true);
     });
   });
 
@@ -90,8 +90,8 @@ describe('Deployment action button', () => {
       });
     });
     it('is disabled and does not show the loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
-      expect(wrapper.find(GlButton).props('disabled')).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
+      expect(wrapper.findComponent(GlButton).props('disabled')).toBe(true);
     });
   });
 
@@ -106,8 +106,8 @@ describe('Deployment action button', () => {
       });
     });
     it('is disabled and does not show the loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
-      expect(wrapper.find(GlButton).props('disabled')).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
+      expect(wrapper.findComponent(GlButton).props('disabled')).toBe(true);
     });
   });
 
@@ -118,8 +118,8 @@ describe('Deployment action button', () => {
       });
     });
     it('is not disabled nor does it show the loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
-      expect(wrapper.find(GlButton).props('disabled')).toBe(false);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
+      expect(wrapper.findComponent(GlButton).props('disabled')).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/vue_merge_request_widget/deployment/deployment_spec.js b/spec/frontend/vue_merge_request_widget/deployment/deployment_spec.js
index c27cbd8b781..12ee100bb9c 100644
--- a/spec/frontend/vue_merge_request_widget/deployment/deployment_spec.js
+++ b/spec/frontend/vue_merge_request_widget/deployment/deployment_spec.js
@@ -37,7 +37,7 @@ describe('Deployment component', () => {
   });
 
   it('always renders DeploymentInfo', () => {
-    expect(wrapper.find(DeploymentInfo).exists()).toBe(true);
+    expect(wrapper.findComponent(DeploymentInfo).exists()).toBe(true);
   });
 
   describe('status message and buttons', () => {
@@ -111,7 +111,7 @@ describe('Deployment component', () => {
         });
 
         it(`renders the text: ${text}`, () => {
-          expect(wrapper.find(DeploymentInfo).text()).toContain(text);
+          expect(wrapper.findComponent(DeploymentInfo).text()).toContain(text);
         });
 
         if (actionButtons.length > 0) {
@@ -150,7 +150,7 @@ describe('Deployment component', () => {
   describe('hasExternalUrls', () => {
     describe('when deployment has both external_url_formatted and external_url', () => {
       it('should render the View Button', () => {
-        expect(wrapper.find(DeploymentViewButton).exists()).toBe(true);
+        expect(wrapper.findComponent(DeploymentViewButton).exists()).toBe(true);
       });
     });
 
@@ -165,7 +165,7 @@ describe('Deployment component', () => {
       });
 
       it('should not render the View Button', () => {
-        expect(wrapper.find(DeploymentViewButton).exists()).toBe(false);
+        expect(wrapper.findComponent(DeploymentViewButton).exists()).toBe(false);
       });
     });
 
@@ -180,7 +180,7 @@ describe('Deployment component', () => {
       });
 
       it('should not render the View Button', () => {
-        expect(wrapper.find(DeploymentViewButton).exists()).toBe(false);
+        expect(wrapper.findComponent(DeploymentViewButton).exists()).toBe(false);
       });
     });
   });
diff --git a/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js b/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js
index 82743275739..05df66165dd 100644
--- a/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js
+++ b/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js
@@ -42,7 +42,7 @@ describe('Test report extension', () => {
   const findFullReportLink = () => wrapper.findByTestId('full-report-link');
   const findCopyFailedSpecsBtn = () => wrapper.findByTestId('copy-failed-specs-btn');
   const findAllExtensionListItems = () => wrapper.findAllByTestId('extension-list-item');
-  const findModal = () => wrapper.find(TestCaseDetails);
+  const findModal = () => wrapper.findComponent(TestCaseDetails);
 
   const createComponent = () => {
     wrapper = mountExtended(extensionsContainer, {
diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_how_to_merge_modal_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_how_to_merge_modal_spec.js
index 295b9df30b9..d038660e6d3 100644
--- a/spec/frontend/vue_merge_request_widget/mr_widget_how_to_merge_modal_spec.js
+++ b/spec/frontend/vue_merge_request_widget/mr_widget_how_to_merge_modal_spec.js
@@ -24,7 +24,7 @@ describe('MRWidgetHowToMerge', () => {
     mountComponent();
   });
 
-  const findModal = () => wrapper.find(GlModal);
+  const findModal = () => wrapper.findComponent(GlModal);
   const findInstructionsFields = () =>
     wrapper.findAll('[ data-testid="how-to-merge-instructions"]');
   const findTipLink = () => wrapper.find("[data-testid='docs-tip']");
diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
index b42abcec3eb..e8233d5b2eb 100644
--- a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
+++ b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
@@ -887,7 +887,10 @@ describe('MrWidgetOptions', () => {
       await nextTick();
 
       expect(
-        wrapper.find('[data-testid="widget-extension-top-level"]').find(GlDropdown).exists(),
+        wrapper
+          .find('[data-testid="widget-extension-top-level"]')
+          .findComponent(GlDropdown)
+          .exists(),
       ).toBe(false);
 
       await nextTick();
@@ -897,19 +900,19 @@ describe('MrWidgetOptions', () => {
       expect(collapsedSection.text()).toContain('Hello world');
 
       // Renders icon in the row
-      expect(collapsedSection.find(GlIcon).exists()).toBe(true);
-      expect(collapsedSection.find(GlIcon).props('name')).toBe('status-failed');
+      expect(collapsedSection.findComponent(GlIcon).exists()).toBe(true);
+      expect(collapsedSection.findComponent(GlIcon).props('name')).toBe('status-failed');
 
       // Renders badge in the row
-      expect(collapsedSection.find(GlBadge).exists()).toBe(true);
-      expect(collapsedSection.find(GlBadge).text()).toBe('Closed');
+      expect(collapsedSection.findComponent(GlBadge).exists()).toBe(true);
+      expect(collapsedSection.findComponent(GlBadge).text()).toBe('Closed');
 
       // Renders a link in the row
-      expect(collapsedSection.find(GlLink).exists()).toBe(true);
-      expect(collapsedSection.find(GlLink).text()).toBe('GitLab.com');
+      expect(collapsedSection.findComponent(GlLink).exists()).toBe(true);
+      expect(collapsedSection.findComponent(GlLink).text()).toBe('GitLab.com');
 
-      expect(collapsedSection.find(GlButton).exists()).toBe(true);
-      expect(collapsedSection.find(GlButton).text()).toBe('Full report');
+      expect(collapsedSection.findComponent(GlButton).exists()).toBe(true);
+      expect(collapsedSection.findComponent(GlButton).text()).toBe('Full report');
     });
 
     it('extension polling is not called if enablePolling flag is not passed', () => {
diff --git a/spec/frontend/vue_shared/components/ci_badge_link_spec.js b/spec/frontend/vue_shared/components/ci_badge_link_spec.js
index 78ba1625666..07cbfe1e79b 100644
--- a/spec/frontend/vue_shared/components/ci_badge_link_spec.js
+++ b/spec/frontend/vue_shared/components/ci_badge_link_spec.js
@@ -105,7 +105,7 @@ describe('CI Badge Link Component', () => {
   it('should emit ciStatusBadgeClick event', async () => {
     createComponent({ status: statuses.success });
 
-    await wrapper.find(GlLink).vm.$emit('click');
+    await wrapper.findComponent(GlLink).vm.$emit('click');
 
     expect(wrapper.emitted('ciStatusBadgeClick')).toEqual([[]]);
   });
diff --git a/spec/frontend/whats_new/components/app_spec.js b/spec/frontend/whats_new/components/app_spec.js
index de5a814d3e7..da95b51c0b1 100644
--- a/spec/frontend/whats_new/components/app_spec.js
+++ b/spec/frontend/whats_new/components/app_spec.js
@@ -54,7 +54,7 @@ describe('App', () => {
     });
   };
 
-  const findInfiniteScroll = () => wrapper.find(GlInfiniteScroll);
+  const findInfiniteScroll = () => wrapper.findComponent(GlInfiniteScroll);
 
   const setup = async () => {
     document.body.dataset.page = 'test-page';
@@ -80,7 +80,7 @@ describe('App', () => {
       setup();
     });
 
-    const getDrawer = () => wrapper.find(GlDrawer);
+    const getDrawer = () => wrapper.findComponent(GlDrawer);
     const getBackdrop = () => wrapper.find('.whats-new-modal-backdrop');
 
     it('contains a drawer', () => {
@@ -173,7 +173,7 @@ describe('App', () => {
 
       value();
 
-      expect(getDrawerBodyHeight).toHaveBeenCalledWith(wrapper.find(GlDrawer).element);
+      expect(getDrawerBodyHeight).toHaveBeenCalledWith(wrapper.findComponent(GlDrawer).element);
 
       expect(actions.setDrawerBodyHeight).toHaveBeenCalledWith(
         expect.any(Object),
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_menu_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_menu_spec.js
index 287ec022d3f..e3f3b74f296 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_menu_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_menu_spec.js
@@ -10,8 +10,8 @@ describe('WorkItemLinksMenu', () => {
     wrapper = shallowMountExtended(WorkItemLinksMenu);
   };
 
-  const findDropdown = () => wrapper.find(GlDropdown);
-  const findRemoveDropdownItem = () => wrapper.find(GlDropdownItem);
+  const findDropdown = () => wrapper.findComponent(GlDropdown);
+  const findRemoveDropdownItem = () => wrapper.findComponent(GlDropdownItem);
 
   beforeEach(async () => {
     createComponent();
diff --git a/spec/frontend/work_items_hierarchy/components/app_spec.js b/spec/frontend/work_items_hierarchy/components/app_spec.js
index 1426fbfab80..124ff5f1608 100644
--- a/spec/frontend/work_items_hierarchy/components/app_spec.js
+++ b/spec/frontend/work_items_hierarchy/components/app_spec.js
@@ -32,7 +32,7 @@ describe('WorkItemsHierarchy App', () => {
     it('shows when the banner is visible', () => {
       createComponent({}, { bannerVisible: true });
 
-      expect(wrapper.find(GlBanner).exists()).toBe(true);
+      expect(wrapper.findComponent(GlBanner).exists()).toBe(true);
     });
 
     it('hide when close is called', async () => {
@@ -42,7 +42,7 @@ describe('WorkItemsHierarchy App', () => {
 
       await nextTick();
 
-      expect(wrapper.find(GlBanner).exists()).toBe(false);
+      expect(wrapper.findComponent(GlBanner).exists()).toBe(false);
     });
   });
 
diff --git a/spec/frontend/work_items_hierarchy/components/hierarchy_spec.js b/spec/frontend/work_items_hierarchy/components/hierarchy_spec.js
index dca016dc317..084aaa754ab 100644
--- a/spec/frontend/work_items_hierarchy/components/hierarchy_spec.js
+++ b/spec/frontend/work_items_hierarchy/components/hierarchy_spec.js
@@ -57,7 +57,7 @@ describe('WorkItemsHierarchy Hierarchy', () => {
     });
 
     it('does not render badges', () => {
-      expect(wrapper.find(GlBadge).exists()).toBe(false);
+      expect(wrapper.findComponent(GlBadge).exists()).toBe(false);
     });
   });
 
diff --git a/spec/graphql/resolvers/project_pipeline_schedules_resolver_spec.rb b/spec/graphql/resolvers/project_pipeline_schedules_resolver_spec.rb
new file mode 100644
index 00000000000..159335adf79
--- /dev/null
+++ b/spec/graphql/resolvers/project_pipeline_schedules_resolver_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Resolvers::ProjectPipelineSchedulesResolver do
+  include GraphqlHelpers
+
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository, public_builds: false) }
+
+  before do
+    project.add_owner(user)
+  end
+
+  describe 'With filters' do
+    let(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project, owner: developer) }
+
+    before do
+      pipeline_schedule.pipelines << build(:ci_pipeline, project: project)
+    end
+
+    it 'shows active pipeline schedules' do
+      schedules = resolve_pipeline_schedules
+
+      expect(schedules).to contain_exactly(pipeline_schedule)
+    end
+
+    it 'shows the inactive pipeline schedules' do
+      schedules = resolve_pipeline_schedules(args:
+                 { status: ::Types::Ci::PipelineScheduleStatusEnum.values['INACTIVE'].value })
+
+      expect(schedules).to be_empty
+    end
+  end
+
+  def resolve_pipeline_schedules(args: {})
+    resolve(described_class, obj: project, ctx: { current_user: user }, args: args)
+  end
+end
diff --git a/spec/graphql/types/ci/pipeline_schedule_status_enum_spec.rb b/spec/graphql/types/ci/pipeline_schedule_status_enum_spec.rb
new file mode 100644
index 00000000000..d271e72b17f
--- /dev/null
+++ b/spec/graphql/types/ci/pipeline_schedule_status_enum_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Types::Ci::PipelineScheduleStatusEnum do
+  specify { expect(described_class.graphql_name ).to eq('PipelineScheduleStatus') }
+
+  it 'exposes the status of a pipeline schedule' do
+    expect(described_class.values.keys).to match_array(%w[ACTIVE INACTIVE])
+  end
+end
diff --git a/spec/graphql/types/ci/pipeline_schedule_type_spec.rb b/spec/graphql/types/ci/pipeline_schedule_type_spec.rb
new file mode 100644
index 00000000000..bf1413ef657
--- /dev/null
+++ b/spec/graphql/types/ci/pipeline_schedule_type_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Types::Ci::PipelineScheduleType do
+  include GraphqlHelpers
+
+  specify { expect(described_class.graphql_name).to eq('PipelineSchedule') }
+  specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Ci::PipelineSchedules) }
+
+  it 'exposes the expected fields' do
+    expected_fields = %i[
+      id
+      description
+      owner
+      active
+      lastPipeline
+      refForDisplay
+      refPath
+      forTag
+      nextRunAt
+      realNextRun
+      cron
+      cronTimezone
+      userPermissions
+    ]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/permission_types/ci/pipeline_schedule_type_spec.rb b/spec/graphql/types/permission_types/ci/pipeline_schedule_type_spec.rb
new file mode 100644
index 00000000000..5929d22b202
--- /dev/null
+++ b/spec/graphql/types/permission_types/ci/pipeline_schedule_type_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Types::Ci::PipelineScheduleType do
+  specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Ci::PipelineSchedules) }
+end
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 617cbdb07fe..9b00c414b3f 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe GitlabSchema.types['Project'] do
       cluster_agent cluster_agents agent_configurations
       ci_template timelogs merge_commit_template squash_commit_template work_item_types
       recent_issue_boards ci_config_path_or_default packages_cleanup_policy ci_variables
-      timelog_categories fork_targets branch_rules ci_config_variables
+      timelog_categories fork_targets branch_rules ci_config_variables pipeline_schedules
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index a9db2a1c008..a3826ec8eb8 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -825,7 +825,7 @@ RSpec.describe ProjectsHelper do
     end
 
     context 'gitaly is working appropriately' do
-      let(:license) { Licensee::License.new('mit') }
+      let(:license) { ::Gitlab::Git::DeclaredLicense.new(key: 'mit', name: 'MIT License') }
 
       before do
         expect(repository).to receive(:license).and_return(license)
diff --git a/spec/lib/gitlab/batch_pop_queueing_spec.rb b/spec/lib/gitlab/batch_pop_queueing_spec.rb
deleted file mode 100644
index 5af78ddabe7..00000000000
--- a/spec/lib/gitlab/batch_pop_queueing_spec.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::BatchPopQueueing do
-  include ExclusiveLeaseHelpers
-  using RSpec::Parameterized::TableSyntax
-
-  describe '#initialize' do
-    where(:namespace, :queue_id, :expect_error, :error_type) do
-      'feature'  | '1' | false  | nil
-      :feature   | '1' | false  | nil
-      nil        | '1' | true   | NoMethodError
-      'feature'  | nil | true   | NoMethodError
-      ''         | '1' | true   | ArgumentError
-      'feature'  | ''  | true   | ArgumentError
-      'feature'  | 1   | true   | NoMethodError
-    end
-
-    with_them do
-      it do
-        if expect_error
-          expect { described_class.new(namespace, queue_id) }.to raise_error(error_type)
-        else
-          expect { described_class.new(namespace, queue_id) }.not_to raise_error
-        end
-      end
-    end
-  end
-
-  describe '#safe_execute', :clean_gitlab_redis_queues do
-    subject { queue.safe_execute(new_items, lock_timeout: lock_timeout) }
-
-    let(:queue) { described_class.new(namespace, queue_id) }
-    let(:namespace) { 'feature' }
-    let(:queue_id) { '1' }
-    let(:lock_timeout) { 10.minutes }
-    let(:new_items) { %w[A B] }
-    let(:lock_key) { queue.send(:lock_key) }
-    let(:queue_key) { queue.send(:queue_key) }
-
-    it 'enqueues new items always' do
-      Gitlab::Redis::Queues.with do |redis|
-        expect(redis).to receive(:sadd).with(queue_key, new_items)
-        expect(redis).to receive(:expire).with(queue_key, (lock_timeout + described_class::EXTRA_QUEUE_EXPIRE_WINDOW).to_i)
-      end
-
-      subject
-    end
-
-    it 'yields the new items with exclusive lease' do
-      uuid = 'test'
-      expect_to_obtain_exclusive_lease(lock_key, uuid, timeout: lock_timeout)
-      expect_to_cancel_exclusive_lease(lock_key, uuid)
-
-      expect { |b| queue.safe_execute(new_items, lock_timeout: lock_timeout, &b) }
-        .to yield_with_args(match_array(new_items))
-    end
-
-    it 'returns the result and no items in the queue' do
-      expect(subject[:status]).to eq(:finished)
-      expect(subject[:new_items]).to be_empty
-
-      Gitlab::Redis::Queues.with do |redis|
-        expect(redis.llen(queue_key)).to be(0)
-      end
-    end
-
-    context 'when new items are enqueued during the process' do
-      it 'returns the result with newly added items' do
-        result = queue.safe_execute(new_items) do
-          queue.safe_execute(['C'])
-        end
-
-        expect(result[:status]).to eq(:finished)
-        expect(result[:new_items]).to eq(['C'])
-
-        Gitlab::Redis::Queues.with do |redis|
-          expect(redis.scard(queue_key)).to be(1)
-        end
-      end
-    end
-
-    context 'when interger items are enqueued' do
-      let(:new_items) { [1, 2, 3] }
-
-      it 'yields as String values' do
-        expect { |b| queue.safe_execute(new_items, lock_timeout: lock_timeout, &b) }
-          .to yield_with_args(%w[1 2 3])
-      end
-    end
-
-    context 'when the queue key does not exist in Redis' do
-      before do
-        allow(queue).to receive(:enqueue) {}
-      end
-
-      it 'yields empty array' do
-        expect { |b| queue.safe_execute(new_items, lock_timeout: lock_timeout, &b) }
-          .to yield_with_args([])
-      end
-    end
-
-    context 'when the other process has already been working on the queue' do
-      before do
-        stub_exclusive_lease_taken(lock_key, timeout: lock_timeout)
-      end
-
-      it 'does not yield the block' do
-        expect { |b| queue.safe_execute(new_items, lock_timeout: lock_timeout, &b) }
-          .not_to yield_control
-      end
-
-      it 'returns the result' do
-        expect(subject[:status]).to eq(:enqueued)
-      end
-    end
-
-    context 'when a duplicate item is enqueued' do
-      it 'returns the poped items to the queue and raise an error' do
-        expect { |b| queue.safe_execute(%w[1 1 2 2], &b) }
-          .to yield_with_args(match_array(%w[1 2]))
-      end
-    end
-
-    context 'when there are two queues' do
-      it 'enqueues items to each queue' do
-        queue_1 = described_class.new(namespace, '1')
-        queue_2 = described_class.new(namespace, '2')
-
-        result_2 = nil
-
-        result_1 = queue_1.safe_execute(['A']) do |_|
-          result_2 = queue_2.safe_execute(['B']) do |_|
-            queue_1.safe_execute(['C'])
-            queue_2.safe_execute(['D'])
-          end
-        end
-
-        expect(result_1[:status]).to eq(:finished)
-        expect(result_1[:new_items]).to eq(['C'])
-        expect(result_2[:status]).to eq(:finished)
-        expect(result_2[:new_items]).to eq(['D'])
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/ci/parsers/security/common_spec.rb b/spec/lib/gitlab/ci/parsers/security/common_spec.rb
index 297ef1f5bb9..828c980dc9a 100644
--- a/spec/lib/gitlab/ci/parsers/security/common_spec.rb
+++ b/spec/lib/gitlab/ci/parsers/security/common_spec.rb
@@ -54,24 +54,15 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
 
         context 'when the validate flag is set to `false`' do
           let(:validate) { false }
-          let(:valid?) { false }
-          let(:errors) { ['foo'] }
-          let(:warnings) { ['bar'] }
 
           before do
-            allow_next_instance_of(validator_class) do |instance|
-              allow(instance).to receive(:valid?).and_return(valid?)
-              allow(instance).to receive(:errors).and_return(errors)
-              allow(instance).to receive(:warnings).and_return(warnings)
-            end
-
             allow(parser).to receive_messages(create_scanner: true, create_scan: true)
           end
 
-          it 'instantiates the validator with correct params' do
+          it 'does not instantiate the validator' do
             parse_report
 
-            expect(validator_class).to have_received(:new).with(
+            expect(validator_class).not_to have_received(:new).with(
               report.type,
               data.deep_stringify_keys,
               report.version,
@@ -80,43 +71,17 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             )
           end
 
-          context 'when the report data is not valid according to the schema' do
-            it 'adds warnings to the report' do
-              expect { parse_report }.to change { report.warnings }.from([]).to(
-                [
-                  { message: 'foo', type: 'Schema' },
-                  { message: 'bar', type: 'Schema' }
-                ]
-              )
-            end
+          it 'marks the report as valid' do
+            parse_report
 
-            it 'keeps the execution flow as normal' do
-              parse_report
-
-              expect(parser).to have_received(:create_scanner)
-              expect(parser).to have_received(:create_scan)
-            end
+            expect(report).not_to be_errored
           end
 
-          context 'when the report data is valid according to the schema' do
-            let(:valid?) { true }
-            let(:errors) { [] }
-            let(:warnings) { [] }
+          it 'keeps the execution flow as normal' do
+            parse_report
 
-            it 'does not add errors to the report' do
-              expect { parse_report }.not_to change { report.errors }
-            end
-
-            it 'does not add warnings to the report' do
-              expect { parse_report }.not_to change { report.warnings }
-            end
-
-            it 'keeps the execution flow as normal' do
-              parse_report
-
-              expect(parser).to have_received(:create_scanner)
-              expect(parser).to have_received(:create_scan)
-            end
+            expect(parser).to have_received(:create_scanner)
+            expect(parser).to have_received(:create_scan)
           end
         end
 
@@ -152,12 +117,17 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             it 'adds errors to the report' do
               expect { parse_report }.to change { report.errors }.from([]).to(
                 [
-                  { message: 'foo', type: 'Schema' },
-                  { message: 'bar', type: 'Schema' }
+                  { message: 'foo', type: 'Schema' }
                 ]
               )
             end
 
+            it 'marks the report as invalid' do
+              parse_report
+
+              expect(report).to be_errored
+            end
+
             it 'does not try to create report entities' do
               parse_report
 
@@ -175,8 +145,24 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
               expect { parse_report }.not_to change { report.errors }.from([])
             end
 
-            it 'does not add warnings to the report' do
-              expect { parse_report }.not_to change { report.warnings }.from([])
+            context 'and no warnings are present' do
+              let(:warnings) { [] }
+
+              it 'does not add warnings to the report' do
+                expect { parse_report }.not_to change { report.warnings }.from([])
+              end
+            end
+
+            context 'and some warnings are present' do
+              let(:warnings) { ['bar'] }
+
+              it 'does add warnings to the report' do
+                expect { parse_report }.to change { report.warnings }.from([]).to(
+                  [
+                    { message: 'bar', type: 'Schema' }
+                  ]
+                )
+              end
             end
 
             it 'keeps the execution flow as normal' do
@@ -298,8 +284,8 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             scans = report.findings.map(&:scan)
 
             expect(scans.map(&:status).all?('success')).to be(true)
-            expect(scans.map(&:start_time).all?('placeholder-value')).to be(true)
-            expect(scans.map(&:end_time).all?('placeholder-value')).to be(true)
+            expect(scans.map(&:start_time).all?('2022-08-10T21:37:00')).to be(true)
+            expect(scans.map(&:end_time).all?('2022-08-10T21:38:00')).to be(true)
             expect(scans.size).to eq(7)
             expect(scans.first).to be_a(::Gitlab::Ci::Reports::Security::Scan)
           end
diff --git a/spec/lib/gitlab/ci/parsers/security/sast_spec.rb b/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
index 4bc48f6611a..9c791317262 100644
--- a/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
+++ b/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
@@ -10,18 +10,24 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Sast do
 
     let(:created_at) { 2.weeks.ago }
 
-    context "when parsing valid reports" do
+    context "when passing valid report" do
       where(:report_format, :report_version, :scanner_length, :finding_length, :identifier_length, :file_path, :line) do
-        :sast               | '14.0.0' | 1 | 5  | 6  | 'groovy/src/main/java/com/gitlab/security_products/tests/App.groovy' | 47
-        :sast_deprecated    | '1.2'    | 3 | 33 | 17 | 'python/hardcoded/hardcoded-tmp.py'                                  | 1
+        :sast | '14.0.0' | 1 | 5 | 6 | 'groovy/src/main/java/com/gitlab/security_products/tests/App.groovy' | 47
       end
 
       with_them do
-        let(:report) { Gitlab::Ci::Reports::Security::Report.new(artifact.file_type, pipeline, created_at) }
+        let(:report) do
+          Gitlab::Ci::Reports::Security::Report.new(
+            artifact.file_type,
+            pipeline,
+            created_at
+          )
+        end
+
         let(:artifact) { create(:ci_job_artifact, report_format) }
 
         before do
-          artifact.each_blob { |blob| described_class.parse!(blob, report) }
+          artifact.each_blob { |blob| described_class.parse!(blob, report, validate: true) }
         end
 
         it "parses all identifiers and findings" do
@@ -47,6 +53,59 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Sast do
       end
     end
 
+    # This spec is KIND OF MAGIC
+    # sast_deprecated trait uses spec/fixtures/security_reports/deprecated/gl-sast-report.json
+    # if you take a look at it then it does not conform to the schema at all, yet it somehow passes.
+    # The reason for this is because lib/gitlab/ci/parsers/security/sast.rb
+    # includes lib/gitlab/ci/parsers/security/concerns/deprecated_syntax.rb
+    # which modifies the report data in place and puts the version there
+    #
+    # TODO: Do not allow modifying input to the parser https://gitlab.com/gitlab-org/gitlab/-/issues/373177
+    context "when parsing unsupported report" do
+      where(:report_format, :report_version) do
+        :sast_deprecated | '1.2'
+      end
+
+      with_them do
+        let(:report) do
+          Gitlab::Ci::Reports::Security::Report.new(
+            artifact.file_type,
+            pipeline,
+            created_at
+          )
+        end
+
+        let(:artifact) { create(:ci_job_artifact, report_format) }
+
+        before do
+          artifact.each_blob { |blob| described_class.parse!(blob, report, validate: validate) }
+        end
+
+        context 'when validation is disabled' do
+          let(:validate) { false }
+
+          it "generates no errors" do
+            expect(report.errors.size).to eq(0)
+          end
+        end
+
+        context 'when validation is enabled' do
+          let(:validate) { true }
+
+          it "generates errors" do
+            messages = report.errors.map { |e| e[:message] }.sort
+            first_error = /^Version #{report_version} for report type sast is unsupported.*/
+            second_error = %r{^property '/version' does not match.*}
+
+            # One for missing version, one for missing required keys
+            expect(report.errors.size).to eq(2)
+            expect(messages.first).to match(first_error)
+            expect(messages.last).to match(second_error)
+          end
+        end
+      end
+    end
+
     context "when parsing an empty report" do
       let(:report) { Gitlab::Ci::Reports::Security::Report.new('sast', pipeline, created_at) }
       let(:blob) { Gitlab::Json.generate({}) }
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 9a87911b6e8..52c6557b93b 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1784,22 +1784,32 @@ RSpec.describe Gitlab::Git::Repository do
     end
   end
 
-  describe '#license_short_name' do
-    subject { repository.license_short_name }
+  describe '#license' do
+    where(from_gitaly: [true, false])
+    with_them do
+      subject(:license) { repository.license(from_gitaly) }
 
-    context 'when no license file can be found' do
-      let(:project) { create(:project, :repository) }
-      let(:repository) { project.repository.raw_repository }
+      context 'when no license file can be found' do
+        let(:project) { create(:project, :repository) }
+        let(:repository) { project.repository.raw_repository }
 
-      before do
-        project.repository.delete_file(project.owner, 'LICENSE', message: 'remove license', branch_name: 'master')
+        before do
+          project.repository.delete_file(project.owner, 'LICENSE', message: 'remove license', branch_name: 'master')
+        end
+
+        it { is_expected.to be_nil }
       end
 
-      it { is_expected.to be_nil }
+      context 'when an mit license is found' do
+        it { is_expected.to have_attributes(key: 'mit') }
+      end
     end
 
-    context 'when an mit license is found' do
-      it { is_expected.to eq('mit') }
+    it 'does not crash when license is not recognized' do
+      expect(Licensee::License).to receive(:new)
+        .and_raise(Licensee::InvalidLicense)
+
+      expect(repository.license(false)).to be_nil
     end
   end
 
diff --git a/spec/migrations/finalize_invalid_group_member_cleanup_spec.rb b/spec/migrations/finalize_invalid_group_member_cleanup_spec.rb
deleted file mode 100644
index c63f0035643..00000000000
--- a/spec/migrations/finalize_invalid_group_member_cleanup_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require_migration!
-
-RSpec.describe FinalizeInvalidGroupMemberCleanup, :migration do
-  let(:batched_migrations) { table(:batched_background_migrations) }
-
-  let_it_be(:migration) { described_class::MIGRATION }
-
-  describe '#up' do
-    shared_examples 'finalizes the migration' do
-      it 'finalizes the migration' do
-        allow_next_instance_of(Gitlab::Database::BackgroundMigration::BatchedMigrationRunner) do |runner|
-          expect(runner).to receive(:finalize).with('DestroyInvalidGroupMembers', :members, :id, [])
-        end
-      end
-    end
-
-    context 'when migration is missing' do
-      it 'warns migration not found' do
-        expect(Gitlab::AppLogger)
-          .to receive(:warn).with(/Could not find batched background migration for the given configuration:/)
-
-        migrate!
-      end
-    end
-
-    context 'with migration present' do
-      let!(:destroy_invalid_group_member_migration) do
-        batched_migrations.create!(
-          job_class_name: 'DestroyInvalidGroupMembers',
-          table_name: :members,
-          column_name: :id,
-          job_arguments: [],
-          interval: 2.minutes,
-          min_value: 1,
-          max_value: 2,
-          batch_size: 1000,
-          sub_batch_size: 200,
-          gitlab_schema: :gitlab_main,
-          status: 3 # finished
-        )
-      end
-
-      context 'when migration finished successfully' do
-        it 'does not raise exception' do
-          expect { migrate! }.not_to raise_error
-        end
-      end
-
-      context 'with different migration statuses' do
-        using RSpec::Parameterized::TableSyntax
-
-        where(:status, :description) do
-          0 | 'paused'
-          1 | 'active'
-          4 | 'failed'
-          5 | 'finalizing'
-        end
-
-        with_them do
-          before do
-            destroy_invalid_group_member_migration.update!(status: status)
-          end
-
-          it_behaves_like 'finalizes the migration'
-        end
-      end
-    end
-  end
-end
diff --git a/spec/migrations/finalize_invalid_project_member_cleanup_spec.rb b/spec/migrations/finalize_invalid_project_member_cleanup_spec.rb
deleted file mode 100644
index a5d3467bb5b..00000000000
--- a/spec/migrations/finalize_invalid_project_member_cleanup_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require_migration!
-
-RSpec.describe FinalizeInvalidProjectMemberCleanup, :migration do
-  let(:batched_migrations) { table(:batched_background_migrations) }
-
-  let_it_be(:migration) { described_class::MIGRATION }
-
-  describe '#up' do
-    shared_examples 'finalizes the migration' do
-      it 'finalizes the migration' do
-        allow_next_instance_of(Gitlab::Database::BackgroundMigration::BatchedMigrationRunner) do |runner|
-          expect(runner).to receive(:finalize).with('DestroyInvalidProjectMembers', :members, :id, [])
-        end
-      end
-    end
-
-    context 'when migration is missing' do
-      it 'warns migration not found' do
-        expect(Gitlab::AppLogger)
-          .to receive(:warn).with(/Could not find batched background migration for the given configuration:/)
-
-        migrate!
-      end
-    end
-
-    context 'with migration present' do
-      let!(:destroy_invalid_project_member_migration) do
-        batched_migrations.create!(
-          job_class_name: 'DestroyInvalidProjectMembers',
-          table_name: :members,
-          column_name: :id,
-          job_arguments: [],
-          interval: 2.minutes,
-          min_value: 1,
-          max_value: 2,
-          batch_size: 1000,
-          sub_batch_size: 200,
-          gitlab_schema: :gitlab_main,
-          status: 3 # finished
-        )
-      end
-
-      context 'when migration finished successfully' do
-        it 'does not raise exception' do
-          expect { migrate! }.not_to raise_error
-        end
-      end
-
-      context 'with different migration statuses' do
-        using RSpec::Parameterized::TableSyntax
-
-        where(:status, :description) do
-          0 | 'paused'
-          1 | 'active'
-          4 | 'failed'
-          5 | 'finalizing'
-        end
-
-        with_them do
-          before do
-            destroy_invalid_project_member_migration.update!(status: status)
-          end
-
-          it_behaves_like 'finalizes the migration'
-        end
-      end
-    end
-  end
-end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index d77a8f50cd1..db3c3010b76 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1331,7 +1331,7 @@ RSpec.describe Repository do
     end
   end
 
-  describe '#license_key', :use_clean_rails_memory_store_caching do
+  describe '#license_key', :clean_gitlab_redis_cache do
     let(:project) { create(:project, :repository) }
 
     before do
@@ -1377,48 +1377,46 @@ RSpec.describe Repository do
     end
   end
 
-  describe '#license' do
-    let(:project) { create(:project, :repository) }
-
-    before do
-      repository.delete_file(user, 'LICENSE',
-        message: 'Remove LICENSE', branch_name: 'master')
-    end
-
-    it 'returns nil when no license is detected' do
-      expect(repository.license).to be_nil
-    end
-
-    it 'returns nil when the repository does not exist' do
-      expect(repository).to receive(:exists?).and_return(false)
-
-      expect(repository.license).to be_nil
-    end
-
-    it 'returns nil when license_key is not recognized' do
-      expect(repository).to receive(:license_key).twice.and_return('not-recognized')
-      expect(Gitlab::ErrorTracking).to receive(:track_exception) do |ex|
-        expect(ex).to be_a(Licensee::InvalidLicense)
+  [true, false].each do |ff|
+    context "with feature flag license_from_gitaly=#{ff}" do
+      before do
+        stub_feature_flags(license_from_gitaly: ff)
       end
 
-      expect(repository.license).to be_nil
-    end
+      describe '#license', :clean_gitlab_redis_cache do
+        let(:project) { create(:project, :repository) }
 
-    it 'returns other when the content is not recognizable' do
-      license = Licensee::License.new('other')
-      repository.create_file(user, 'LICENSE', 'Gitlab B.V.',
-        message: 'Add LICENSE', branch_name: 'master')
+        before do
+          repository.delete_file(user, 'LICENSE',
+                                 message: 'Remove LICENSE', branch_name: 'master')
+        end
 
-      expect(repository.license).to eq(license)
-    end
+        it 'returns nil when no license is detected' do
+          expect(repository.license).to be_nil
+        end
 
-    it 'returns the license' do
-      license = Licensee::License.new('mit')
-      repository.create_file(user, 'LICENSE',
-        license.content,
-        message: 'Add LICENSE', branch_name: 'master')
+        it 'returns nil when the repository does not exist' do
+          expect(repository).to receive(:exists?).and_return(false)
 
-      expect(repository.license).to eq(license)
+          expect(repository.license).to be_nil
+        end
+
+        it 'returns other when the content is not recognizable' do
+          repository.create_file(user, 'LICENSE', 'Gitlab B.V.',
+                                 message: 'Add LICENSE', branch_name: 'master')
+
+          expect(repository.license_key).to eq('other')
+        end
+
+        it 'returns the license' do
+          license = Licensee::License.new('mit')
+          repository.create_file(user, 'LICENSE',
+                                 license.content,
+                                 message: 'Add LICENSE', branch_name: 'master')
+
+          expect(repository.license_key).to eq(license.key)
+        end
+      end
     end
   end
 
@@ -2207,7 +2205,8 @@ RSpec.describe Repository do
         :contribution_guide,
         :changelog,
         :license_blob,
-        :license_key,
+        :license_licensee,
+        :license_gitaly,
         :gitignore,
         :gitlab_ci_yml,
         :branch_names,
@@ -2695,7 +2694,7 @@ RSpec.describe Repository do
         match[1].to_sym if match
       end.compact
 
-      expect(Repository::CACHED_METHODS + Repository::MEMOIZED_CACHED_METHODS).to include(*methods)
+      expect(Repository::CACHED_METHODS).to include(*methods)
     end
   end
 
@@ -2860,12 +2859,12 @@ RSpec.describe Repository do
   describe '#refresh_method_caches' do
     it 'refreshes the caches of the given types' do
       expect(repository).to receive(:expire_method_caches)
-        .with(%i(readme_path license_blob license_key license))
+        .with(%i(readme_path license_blob license_licensee license_gitaly))
 
       expect(repository).to receive(:readme_path)
       expect(repository).to receive(:license_blob)
-      expect(repository).to receive(:license_key)
-      expect(repository).to receive(:license)
+      expect(repository).to receive(:license_licensee)
+      expect(repository).to receive(:license_gitaly)
 
       repository.refresh_method_caches(%i(readme license))
     end
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 7ff19b1b770..832deee6186 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -10,13 +10,15 @@ RSpec.describe ProjectPresenter do
   describe '#license_short_name' do
     context 'when project.repository has a license_key' do
       it 'returns the nickname of the license if present' do
-        allow(project.repository).to receive(:license_key).and_return('agpl-3.0')
+        allow(project.repository).to receive(:license).and_return(
+          ::Gitlab::Git::DeclaredLicense.new(name: 'foo', nickname: 'GNU AGPLv3'))
 
         expect(presenter.license_short_name).to eq('GNU AGPLv3')
       end
 
       it 'returns the name of the license if nickname is not present' do
-        allow(project.repository).to receive(:license_key).and_return('mit')
+        allow(project.repository).to receive(:license).and_return(
+          ::Gitlab::Git::DeclaredLicense.new(name: 'MIT License'))
 
         expect(presenter.license_short_name).to eq('MIT License')
       end
@@ -24,7 +26,7 @@ RSpec.describe ProjectPresenter do
 
     context 'when project.repository has no license_key but a license_blob' do
       it 'returns LICENSE' do
-        allow(project.repository).to receive(:license_key).and_return(nil)
+        allow(project.repository).to receive(:license).and_return(nil)
 
         expect(presenter.license_short_name).to eq('LICENSE')
       end
diff --git a/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb b/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb
new file mode 100644
index 00000000000..8b8ba09a95c
--- /dev/null
+++ b/spec/requests/api/graphql/ci/pipeline_schedules_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Query.project.pipelineSchedules' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :repository, :public) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project, owner: user) }
+
+  let(:pipeline_schedule_graphql_data) { graphql_data_at(:project, :pipeline_schedules, :nodes, 0) }
+
+  let(:params) { {} }
+
+  let(:fields) do
+    <<~QUERY
+      nodes {
+        id
+        description
+        active
+        nextRunAt
+        realNextRun
+        lastPipeline {
+             id
+        }
+        refForDisplay
+        refPath
+        forTag
+        cron
+        cronTimezone
+      }
+    QUERY
+  end
+
+  let(:query) do
+    %(
+      query {
+        project(fullPath: "#{project.full_path}") {
+          pipelineSchedules {
+            #{fields}
+          }
+        }
+      }
+    )
+  end
+
+  describe 'computed graphql fields' do
+    before do
+      pipeline_schedule.pipelines << build(:ci_pipeline, project: project)
+
+      post_graphql(query, current_user: user)
+    end
+
+    it_behaves_like 'a working graphql query'
+
+    it 'returns calculated fields for a pipeline schedule' do
+      ref_for_display = pipeline_schedule_graphql_data['refForDisplay']
+
+      expect(ref_for_display).to eq('master')
+      expect(pipeline_schedule_graphql_data['refPath']).to eq("/#{project.full_path}/-/commits/#{ref_for_display}")
+      expect(pipeline_schedule_graphql_data['forTag']).to be(false)
+    end
+  end
+
+  it 'avoids N+1 queries' do
+    create_pipeline_schedules(1)
+
+    control = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: user) }
+
+    create_pipeline_schedules(3)
+
+    action = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: user) }
+
+    expect(action).not_to exceed_query_limit(control)
+  end
+
+  def create_pipeline_schedules(count)
+    create_list(:ci_pipeline_schedule, count, project: project)
+      .each do |pipeline_schedule|
+      create(:user).tap do |user|
+        project.add_developer(user)
+        pipeline_schedule.update!(owner: user)
+      end
+      pipeline_schedule.pipelines << build(:ci_pipeline, project: project)
+    end
+  end
+end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 7ad1ce0ede9..4ffc6055a23 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -2516,7 +2516,7 @@ RSpec.describe API::Projects do
           'name' => project.repository.license.name,
           'nickname' => project.repository.license.nickname,
           'html_url' => project.repository.license.url,
-          'source_url' => project.repository.license.meta['source']
+          'source_url' => nil
         })
       end