Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

13 files changed, 0 insertions, 64 deletions

diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml
index f24fbbfbed2..e589d9ed9c6 100644
--- a/.rubocop_todo/rspec/any_instance_of.yml
+++ b/.rubocop_todo/rspec/any_instance_of.yml
@@ -2,24 +2,7 @@
 # Cop supports --autocorrect.
 RSpec/AnyInstanceOf:
   Exclude:
-    - 'ee/spec/controllers/admin/geo/nodes_controller_spec.rb'
-    - 'ee/spec/controllers/ee/groups_controller_spec.rb'
-    - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb'
-    - 'ee/spec/controllers/groups/epics/notes_controller_spec.rb'
-    - 'ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb'
-    - 'ee/spec/controllers/oauth/geo_auth_controller_spec.rb'
-    - 'ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb'
-    - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'
-    - 'ee/spec/controllers/projects/path_locks_controller_spec.rb'
-    - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/controllers/subscriptions_controller_spec.rb'
-    - 'ee/spec/features/admin/admin_audit_logs_spec.rb'
-    - 'ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb'
-    - 'ee/spec/features/admin/admin_users_spec.rb'
-    - 'ee/spec/features/ci_shared_runner_warnings_spec.rb'
-    - 'ee/spec/features/groups/group_settings_spec.rb'
     - 'ee/spec/features/issues/form_spec.rb'
-    - 'ee/spec/features/merge_request/user_creates_merge_request_spec.rb'
     - 'ee/spec/features/projects/new_project_spec.rb'
     - 'ee/spec/features/registrations/welcome_spec.rb'
     - 'ee/spec/features/security/project/internal_access_spec.rb'
@@ -378,7 +361,6 @@ RSpec/AnyInstanceOf:
     - 'spec/workers/build_hooks_worker_spec.rb'
     - 'spec/workers/ci/build_schedule_worker_spec.rb'
     - 'spec/workers/ci/daily_build_group_report_results_worker_spec.rb'
-    - 'spec/workers/cluster_provision_worker_spec.rb'
     - 'spec/workers/clusters/cleanup/project_namespace_worker_spec.rb'
     - 'spec/workers/clusters/cleanup/service_account_worker_spec.rb'
     - 'spec/workers/concerns/project_import_options_spec.rb'
@@ -398,4 +380,3 @@ RSpec/AnyInstanceOf:
     - 'spec/workers/pipeline_schedule_worker_spec.rb'
     - 'spec/workers/project_cache_worker_spec.rb'
     - 'spec/workers/stage_update_worker_spec.rb'
-    - 'spec/workers/wait_for_cluster_creation_worker_spec.rb'
diff --git a/.rubocop_todo/rspec/capybara/visibility_matcher.yml b/.rubocop_todo/rspec/capybara/visibility_matcher.yml
index f9e8c982903..5f35e5d90f7 100644
--- a/.rubocop_todo/rspec/capybara/visibility_matcher.yml
+++ b/.rubocop_todo/rspec/capybara/visibility_matcher.yml
@@ -46,7 +46,6 @@ RSpec/Capybara/VisibilityMatcher:
     - 'spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb'
     - 'spec/features/projects/jobs_spec.rb'
     - 'spec/features/projects/network_graph_spec.rb'
-    - 'spec/features/projects/pipelines/legacy_pipeline_spec.rb'
     - 'spec/features/projects/pipelines/pipeline_spec.rb'
     - 'spec/features/projects/settings/lfs_settings_spec.rb'
     - 'spec/features/projects/settings/packages_settings_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 5a01f229482..ccadc31c974 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -47,7 +47,6 @@ RSpec/ContextWording:
     - 'ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb'
     - 'ee/spec/controllers/projects/integrations/zentao/issues_controller_spec.rb'
     - 'ee/spec/controllers/projects/issues_controller_spec.rb'
-    - 'ee/spec/controllers/projects/legacy_pipelines_controller_spec.rb'
     - 'ee/spec/controllers/projects/merge_requests/creations_controller_spec.rb'
     - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'
     - 'ee/spec/controllers/projects/mirrors_controller_spec.rb'
@@ -59,7 +58,6 @@ RSpec/ContextWording:
     - 'ee/spec/controllers/projects/settings/repository_controller_spec.rb'
     - 'ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb'
     - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/welcome_controller_spec.rb'
     - 'ee/spec/controllers/repositories/git_http_controller_spec.rb'
     - 'ee/spec/controllers/security/dashboard_controller_spec.rb'
     - 'ee/spec/controllers/security/vulnerabilities_controller_spec.rb'
@@ -156,7 +154,6 @@ RSpec/ContextWording:
     - 'ee/spec/features/projects/milestones/milestone_spec.rb'
     - 'ee/spec/features/projects/new_project_from_template_spec.rb'
     - 'ee/spec/features/projects/new_project_spec.rb'
-    - 'ee/spec/features/projects/pipelines/legacy_pipeline_spec.rb'
     - 'ee/spec/features/projects/pipelines/pipeline_spec.rb'
     - 'ee/spec/features/projects/push_rules_spec.rb'
     - 'ee/spec/features/projects/quality/test_case_create_spec.rb'
@@ -284,7 +281,6 @@ RSpec/ContextWording:
     - 'ee/spec/helpers/ee/operations_helper_spec.rb'
     - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb'
     - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb'
-    - 'ee/spec/helpers/ee/welcome_helper_spec.rb'
     - 'ee/spec/helpers/groups/security_features_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'
     - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
@@ -335,8 +331,6 @@ RSpec/ContextWording:
     - 'ee/spec/lib/ee/gitlab/group_search_results_spec.rb'
     - 'ee/spec/lib/ee/gitlab/hook_data/group_member_builder_spec.rb'
     - 'ee/spec/lib/ee/gitlab/hook_data/user_builder_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_restorer_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb'
     - 'ee/spec/lib/ee/gitlab/import_export/group/tree_restorer_spec.rb'
     - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb'
     - 'ee/spec/lib/ee/gitlab/import_export/project/tree_saver_spec.rb'
@@ -441,7 +435,6 @@ RSpec/ContextWording:
     - 'ee/spec/migrations/schedule_requirements_migration_spec.rb'
     - 'ee/spec/models/alert_management/alert_payload_field_spec.rb'
     - 'ee/spec/models/allowed_email_domain_spec.rb'
-    - 'ee/spec/models/analytics/cycle_analytics/group_stage_spec.rb'
     - 'ee/spec/models/analytics/cycle_analytics/project_stage_spec.rb'
     - 'ee/spec/models/application_setting_spec.rb'
     - 'ee/spec/models/approval_merge_request_rule_spec.rb'
@@ -639,7 +632,6 @@ RSpec/ContextWording:
     - 'ee/spec/requests/api/projects_spec.rb'
     - 'ee/spec/requests/api/protected_branches_spec.rb'
     - 'ee/spec/requests/api/releases_spec.rb'
-    - 'ee/spec/requests/api/scim_spec.rb'
     - 'ee/spec/requests/api/search_spec.rb'
     - 'ee/spec/requests/api/settings_spec.rb'
     - 'ee/spec/requests/api/status_checks_spec.rb'
@@ -926,7 +918,6 @@ RSpec/ContextWording:
     - 'ee/spec/views/layouts/nav/sidebar/_push_rules_link.html.haml_spec.rb'
     - 'ee/spec/views/profiles/preferences/show.html.haml_spec.rb'
     - 'ee/spec/views/projects/security/discover/show.html.haml_spec.rb'
-    - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/search/_category.html.haml_spec.rb'
     - 'ee/spec/views/shared/_clone_panel.html.haml_spec.rb'
     - 'ee/spec/views/shared/_kerberos_clone_button.html.haml_spec.rb'
@@ -984,7 +975,6 @@ RSpec/ContextWording:
     - 'qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/license/cloud_activation_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/license/license_spec.rb'
-    - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/purchase/free_tier_group_namespace_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/purchase/purchase_ci_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/purchase/purchase_storage_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/13_secure/enable_scanning_from_configuration_spec.rb'
@@ -1121,7 +1111,6 @@ RSpec/ContextWording:
     - 'spec/controllers/projects/tree_controller_spec.rb'
     - 'spec/controllers/projects/web_ide_terminals_controller_spec.rb'
     - 'spec/controllers/projects_controller_spec.rb'
-    - 'spec/controllers/registrations/welcome_controller_spec.rb'
     - 'spec/controllers/registrations_controller_spec.rb'
     - 'spec/controllers/root_controller_spec.rb'
     - 'spec/controllers/search_controller_spec.rb'
@@ -1328,8 +1317,6 @@ RSpec/ContextWording:
     - 'spec/features/projects/packages_spec.rb'
     - 'spec/features/projects/pages/user_edits_settings_spec.rb'
     - 'spec/features/projects/pipeline_schedules_spec.rb'
-    - 'spec/features/projects/pipelines/legacy_pipeline_spec.rb'
-    - 'spec/features/projects/pipelines/legacy_pipelines_spec.rb'
     - 'spec/features/projects/pipelines/pipeline_spec.rb'
     - 'spec/features/projects/pipelines/pipelines_spec.rb'
     - 'spec/features/projects/releases/user_views_releases_spec.rb'
@@ -1974,8 +1961,6 @@ RSpec/ContextWording:
     - 'spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb'
     - 'spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb'
     - 'spec/lib/gitlab/import_export/file_importer_spec.rb'
-    - 'spec/lib/gitlab/import_export/group/legacy_tree_restorer_spec.rb'
-    - 'spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb'
     - 'spec/lib/gitlab/import_export/group/object_builder_spec.rb'
     - 'spec/lib/gitlab/import_export/group/relation_factory_spec.rb'
     - 'spec/lib/gitlab/import_export/group/tree_restorer_spec.rb'
@@ -2342,7 +2327,6 @@ RSpec/ContextWording:
     - 'spec/models/internal_id_spec.rb'
     - 'spec/models/issue/metrics_spec.rb'
     - 'spec/models/issue_assignee_spec.rb'
-    - 'spec/models/issue_collection_spec.rb'
     - 'spec/models/issue_spec.rb'
     - 'spec/models/jira_import_state_spec.rb'
     - 'spec/models/key_spec.rb'
@@ -2725,7 +2709,6 @@ RSpec/ContextWording:
     - 'spec/services/branches/validate_new_service_spec.rb'
     - 'spec/services/bulk_create_integration_service_spec.rb'
     - 'spec/services/chat_names/find_user_service_spec.rb'
-    - 'spec/services/ci/after_requeue_job_service_spec.rb'
     - 'spec/services/ci/append_build_trace_service_spec.rb'
     - 'spec/services/ci/archive_trace_service_spec.rb'
     - 'spec/services/ci/compare_test_reports_service_spec.rb'
@@ -2759,16 +2742,8 @@ RSpec/ContextWording:
     - 'spec/services/clusters/agent_tokens/track_usage_service_spec.rb'
     - 'spec/services/clusters/agents/delete_expired_events_service_spec.rb'
     - 'spec/services/clusters/agents/refresh_authorization_service_spec.rb'
-    - 'spec/services/clusters/applications/install_service_spec.rb'
-    - 'spec/services/clusters/applications/upgrade_service_spec.rb'
-    - 'spec/services/clusters/aws/authorize_role_service_spec.rb'
-    - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
-    - 'spec/services/clusters/aws/finalize_creation_service_spec.rb'
-    - 'spec/services/clusters/aws/provision_service_spec.rb'
-    - 'spec/services/clusters/aws/verify_provision_status_service_spec.rb'
     - 'spec/services/clusters/build_kubernetes_namespace_service_spec.rb'
     - 'spec/services/clusters/create_service_spec.rb'
-    - 'spec/services/clusters/gcp/finalize_creation_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_namespace_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb'
     - 'spec/services/clusters/management/validate_management_project_permissions_service_spec.rb'
@@ -3074,7 +3049,6 @@ RSpec/ContextWording:
     - 'spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb'
     - 'spec/support/shared_contexts/lib/gitlab/sidekiq_middleware/server_metrics_shared_context.rb'
     - 'spec/support/shared_contexts/mailers/notify_shared_context.rb'
-    - 'spec/support/shared_contexts/markdown_golden_master_shared_examples.rb'
     - 'spec/support/shared_contexts/merge_request_create_shared_context.rb'
     - 'spec/support/shared_contexts/merge_request_edit_shared_context.rb'
     - 'spec/support/shared_contexts/merge_requests_allowing_collaboration_shared_context.rb'
diff --git a/.rubocop_todo/rspec/described_class.yml b/.rubocop_todo/rspec/described_class.yml
index 729423d8abd..b60fca01288 100644
--- a/.rubocop_todo/rspec/described_class.yml
+++ b/.rubocop_todo/rspec/described_class.yml
@@ -145,7 +145,6 @@ RSpec/DescribedClass:
     - 'spec/lib/sidebars/panel_spec.rb'
     - 'spec/mailers/emails/service_desk_spec.rb'
     - 'spec/metrics_server/metrics_server_spec.rb'
-    - 'spec/migrations/remove_records_without_group_from_webhooks_table_spec.rb'
     - 'spec/models/active_session_spec.rb'
     - 'spec/models/alert_management/alert_spec.rb'
     - 'spec/models/application_record_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
index 23bb61a5d68..24db05a5004 100644
--- a/.rubocop_todo/rspec/expect_change.yml
+++ b/.rubocop_todo/rspec/expect_change.yml
@@ -81,7 +81,6 @@ RSpec/ExpectChange:
     - 'ee/spec/requests/groups/protected_environments_controller_spec.rb'
     - 'ee/spec/requests/groups_controller_spec.rb'
     - 'ee/spec/requests/registrations/project_creation_spec.rb'
-    - 'ee/spec/requests/registrations_controller_spec.rb'
     - 'ee/spec/services/app_sec/dast/scanner_profiles/create_service_spec.rb'
     - 'ee/spec/services/app_sec/dast/scans/run_service_spec.rb'
     - 'ee/spec/services/app_sec/dast/site_profiles/create_service_spec.rb'
@@ -291,7 +290,6 @@ RSpec/ExpectChange:
     - 'spec/migrations/20221018050323_add_objective_and_keyresult_to_work_item_types_spec.rb'
     - 'spec/migrations/20221018193635_ensure_task_note_renaming_background_migration_finished_spec.rb'
     - 'spec/migrations/20221102090940_create_next_ci_partitions_record_spec.rb'
-    - 'spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb'
     - 'spec/migrations/cleanup_mr_attention_request_todos_spec.rb'
     - 'spec/migrations/cleanup_vulnerability_state_transitions_with_same_from_state_to_state_spec.rb'
     - 'spec/migrations/delete_migrate_shared_vulnerability_scanners_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml
index aa0f5f005d7..7fc5bdbdb6d 100644
--- a/.rubocop_todo/rspec/expect_in_hook.yml
+++ b/.rubocop_todo/rspec/expect_in_hook.yml
@@ -25,7 +25,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
     - 'ee/spec/helpers/ee/issues_helper_spec.rb'
     - 'ee/spec/helpers/ee/projects/security/dast_configuration_helper_spec.rb'
-    - 'ee/spec/helpers/ee/welcome_helper_spec.rb'
     - 'ee/spec/helpers/kerberos_helper_spec.rb'
     - 'ee/spec/helpers/vulnerabilities_helper_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/members_helpers_spec.rb'
@@ -302,7 +301,6 @@ RSpec/ExpectInHook:
     - 'spec/lib/sidebars/projects/menus/external_wiki_menu_spec.rb'
     - 'spec/mailers/emails/service_desk_spec.rb'
     - 'spec/metrics_server/metrics_server_spec.rb'
-    - 'spec/migrations/20210406144743_backfill_total_tuple_count_for_batched_migrations_spec.rb'
     - 'spec/models/ability_spec.rb'
     - 'spec/models/application_setting_spec.rb'
     - 'spec/models/ci/build_spec.rb'
@@ -387,9 +385,6 @@ RSpec/ExpectInHook:
     - 'spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb'
     - 'spec/services/ci/job_artifacts/destroy_batch_service_spec.rb'
     - 'spec/services/ci/register_job_service_spec.rb'
-    - 'spec/services/clusters/applications/install_service_spec.rb'
-    - 'spec/services/clusters/applications/upgrade_service_spec.rb'
-    - 'spec/services/clusters/aws/fetch_credentials_service_spec.rb'
     - 'spec/services/clusters/integrations/prometheus_health_check_service_spec.rb'
     - 'spec/services/container_expiration_policies/cleanup_service_spec.rb'
     - 'spec/services/dependency_proxy/find_cached_manifest_service_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 3201d5a8370..c4a64f505f1 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -224,7 +224,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/views/projects/edit.html.haml_spec.rb'
     - 'ee/spec/views/projects/issues/show.html.haml_spec.rb'
     - 'ee/spec/views/projects/on_demand_scans/index.html.haml_spec.rb'
-    - 'ee/spec/views/projects/pipelines/_tabs_content.html.haml_spec.rb'
     - 'ee/spec/views/projects/project_members/index.html.haml_spec.rb'
     - 'ee/spec/views/projects/security/corpus_management/show.html.haml_spec.rb'
     - 'ee/spec/views/projects/security/dast_profiles/show.html.haml_spec.rb'
diff --git a/.rubocop_todo/rspec/hooks_before_examples.yml b/.rubocop_todo/rspec/hooks_before_examples.yml
index 333687e1cc4..a6291452db8 100644
--- a/.rubocop_todo/rspec/hooks_before_examples.yml
+++ b/.rubocop_todo/rspec/hooks_before_examples.yml
@@ -42,5 +42,4 @@ RSpec/HooksBeforeExamples:
     - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/prevent_forking_outside_group_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/1_manage/ldap/admin_ldap_sync_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/1_manage/user/minimal_access_user_spec.rb'
-    - 'qa/spec/resource/reusable_collection_spec.rb'
     - 'qa/spec/specs/runner_spec.rb'
diff --git a/.rubocop_todo/rspec/instance_variable.yml b/.rubocop_todo/rspec/instance_variable.yml
index b1b4a6c16ce..d57eb938567 100644
--- a/.rubocop_todo/rspec/instance_variable.yml
+++ b/.rubocop_todo/rspec/instance_variable.yml
@@ -113,7 +113,6 @@ RSpec/InstanceVariable:
     - 'spec/lib/gitlab/git/diff_spec.rb'
     - 'spec/lib/gitlab/git/repository_spec.rb'
     - 'spec/lib/gitlab/http_spec.rb'
-    - 'spec/lib/gitlab/import_export/group/legacy_tree_restorer_spec.rb'
     - 'spec/lib/gitlab/import_export/group/tree_restorer_spec.rb'
     - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
     - 'spec/lib/gitlab/patch/prependable_spec.rb'
diff --git a/.rubocop_todo/rspec/multiple_memoized_helpers.yml b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
index e939abd2886..708543510a2 100644
--- a/.rubocop_todo/rspec/multiple_memoized_helpers.yml
+++ b/.rubocop_todo/rspec/multiple_memoized_helpers.yml
@@ -17,7 +17,6 @@ RSpec/MultipleMemoizedHelpers:
     - 'spec/finders/user_recent_events_finder_spec.rb'
     - 'spec/lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid_spec.rb'
     - 'spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb'
-    - 'spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb'
     - 'spec/models/event_spec.rb'
     - 'spec/models/milestone_spec.rb'
     - 'spec/models/packages/package_file_spec.rb'
diff --git a/.rubocop_todo/rspec/repeated_example_group_body.yml b/.rubocop_todo/rspec/repeated_example_group_body.yml
index 93cbe77765a..a0981240d48 100644
--- a/.rubocop_todo/rspec/repeated_example_group_body.yml
+++ b/.rubocop_todo/rspec/repeated_example_group_body.yml
@@ -22,7 +22,6 @@ RSpec/RepeatedExampleGroupBody:
     - 'spec/features/issues/spam_akismet_issue_creation_spec.rb'
     - 'spec/features/merge_request/user_sees_closing_issues_message_spec.rb'
     - 'spec/features/projects/commit/cherry_pick_spec.rb'
-    - 'spec/features/projects/pipelines/legacy_pipeline_spec.rb'
     - 'spec/features/security/project/private_access_spec.rb'
     - 'spec/finders/packages/nuget/package_finder_spec.rb'
     - 'spec/helpers/gitlab_routing_helper_spec.rb'
diff --git a/.rubocop_todo/rspec/repeated_example_group_description.yml b/.rubocop_todo/rspec/repeated_example_group_description.yml
index 826ac2a6838..27eea044e6c 100644
--- a/.rubocop_todo/rspec/repeated_example_group_description.yml
+++ b/.rubocop_todo/rspec/repeated_example_group_description.yml
@@ -36,7 +36,6 @@ RSpec/RepeatedExampleGroupDescription:
     - 'spec/features/merge_request/user_sees_merge_widget_spec.rb'
     - 'spec/features/projects/jobs_spec.rb'
     - 'spec/features/projects/new_project_spec.rb'
-    - 'spec/features/projects/pipelines/legacy_pipeline_spec.rb'
     - 'spec/features/security/project/private_access_spec.rb'
     - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb'
     - 'spec/frontend/fixtures/startup_css.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 8fa03c775be..b880f995669 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -746,7 +746,6 @@ RSpec/VerifiedDoubles:
     - 'spec/mailers/emails/service_desk_spec.rb'
     - 'spec/mailers/notify_spec.rb'
     - 'spec/metrics_server/metrics_server_spec.rb'
-    - 'spec/migrations/20210406144743_backfill_total_tuple_count_for_batched_migrations_spec.rb'
     - 'spec/models/active_session_spec.rb'
     - 'spec/models/application_record_spec.rb'
     - 'spec/models/badge_spec.rb'
@@ -890,9 +889,6 @@ RSpec/VerifiedDoubles:
     - 'spec/services/ci/test_failure_history_service_spec.rb'
     - 'spec/services/ci/update_build_queue_service_spec.rb'
     - 'spec/services/ci/update_build_state_service_spec.rb'
-    - 'spec/services/clusters/aws/finalize_creation_service_spec.rb'
-    - 'spec/services/clusters/aws/provision_service_spec.rb'
-    - 'spec/services/clusters/aws/verify_provision_status_service_spec.rb'
     - 'spec/services/clusters/build_kubernetes_namespace_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_namespace_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb'