Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

6 files changed, 3 insertions, 231 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 195f3fee98e..4b5fb5ad1a6 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -655,7 +655,6 @@ Layout/ArgumentAlignment:
     - 'spec/features/merge_request/user_sees_versions_spec.rb'
     - 'spec/features/merge_requests/user_lists_merge_requests_spec.rb'
     - 'spec/features/merge_requests/user_views_open_merge_requests_spec.rb'
-    - 'spec/features/projects/branches_spec.rb'
     - 'spec/features/projects/commit/mini_pipeline_graph_spec.rb'
     - 'spec/features/projects/environments/environment_spec.rb'
     - 'spec/features/projects/environments/environments_spec.rb'
diff --git a/.rubocop_todo/layout/first_array_element_indentation.yml b/.rubocop_todo/layout/first_array_element_indentation.yml
index cbe806fc16f..d4a3d2f5524 100644
--- a/.rubocop_todo/layout/first_array_element_indentation.yml
+++ b/.rubocop_todo/layout/first_array_element_indentation.yml
@@ -1,7 +1,6 @@
 ---
 # Cop supports --auto-correct.
 Layout/FirstArrayElementIndentation:
-  Details: grace period
   Exclude:
     - 'spec/lib/gitlab/github_import/importer/issues_importer_spec.rb'
     - 'spec/lib/gitlab/search/found_blob_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index fe9c0593f7d..b5fc199c0ca 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -371,7 +371,6 @@ Layout/LineLength:
     - 'app/models/diff_note.rb'
     - 'app/models/environment.rb'
     - 'app/models/error_tracking/project_error_tracking_setting.rb'
-    - 'app/models/event_collection.rb'
     - 'app/models/exported_protected_branch.rb'
     - 'app/models/group.rb'
     - 'app/models/incident_management/project_incident_management_setting.rb'
@@ -597,7 +596,6 @@ Layout/LineLength:
     - 'app/services/loose_foreign_keys/cleaner_service.rb'
     - 'app/services/members/destroy_service.rb'
     - 'app/services/members/invitation_reminder_email_service.rb'
-    - 'app/services/members/update_service.rb'
     - 'app/services/merge_requests/add_context_service.rb'
     - 'app/services/merge_requests/assign_issues_service.rb'
     - 'app/services/merge_requests/base_service.rb'
@@ -1817,7 +1815,6 @@ Layout/LineLength:
     - 'ee/spec/features/groups/scim_token_spec.rb'
     - 'ee/spec/features/groups/security/compliance_dashboards_spec.rb'
     - 'ee/spec/features/groups/sso_spec.rb'
-    - 'ee/spec/features/groups/usage_quotas_spec.rb'
     - 'ee/spec/features/integrations/jira/jira_issues_list_spec.rb'
     - 'ee/spec/features/invites_spec.rb'
     - 'ee/spec/features/issues/filtered_search/filter_issues_weight_spec.rb'
@@ -1915,7 +1912,7 @@ Layout/LineLength:
     - 'ee/spec/frontend/fixtures/projects.rb'
     - 'ee/spec/graphql/ee/mutations/boards/lists/create_spec.rb'
     - 'ee/spec/graphql/ee/resolvers/board_list_issues_resolver_spec.rb'
-    - 'ee/spec/graphql/ee/resolvers/issues_resolver_spec.rb'
+    - 'ee/spec/graphql/ee/resolvers/project_issues_resolver_spec.rb'
     - 'ee/spec/graphql/ee/types/board_type_spec.rb'
     - 'ee/spec/graphql/ee/types/issue_sort_enum_spec.rb'
     - 'ee/spec/graphql/ee/types/merge_request_type_spec.rb'
@@ -2855,7 +2852,6 @@ Layout/LineLength:
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/shared/_mirror_status.html.haml_spec.rb'
     - 'ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb'
-    - 'ee/spec/views/shared/access_tokens/_table.html.haml_spec.rb'
     - 'ee/spec/views/shared/billings/_eoa_bronze_plan_banner.html.haml_spec.rb'
     - 'ee/spec/views/shared/billings/_trial_status.html.haml_spec.rb'
     - 'ee/spec/views/shared/credentials_inventory/personal_access_tokens/_personal_access_token.html.haml_spec.rb'
@@ -2910,7 +2906,6 @@ Layout/LineLength:
     - 'ee/spec/workers/update_all_mirrors_worker_spec.rb'
     - 'ee/spec/workers/vulnerability_exports/export_deletion_worker_spec.rb'
     - 'lib/api/admin/instance_clusters.rb'
-    - 'lib/api/admin/plan_limits.rb'
     - 'lib/api/api.rb'
     - 'lib/api/appearance.rb'
     - 'lib/api/award_emoji.rb'
@@ -2946,19 +2941,15 @@ Layout/LineLength:
     - 'lib/api/entities/issue_basic.rb'
     - 'lib/api/entities/merge_request.rb'
     - 'lib/api/entities/namespace.rb'
-    - 'lib/api/entities/package.rb'
     - 'lib/api/entities/project.rb'
     - 'lib/api/entities/user.rb'
     - 'lib/api/environments.rb'
-    - 'lib/api/error_tracking/project_settings.rb'
     - 'lib/api/feature_flags.rb'
     - 'lib/api/files.rb'
     - 'lib/api/generic_packages.rb'
-    - 'lib/api/go_proxy.rb'
     - 'lib/api/group_clusters.rb'
     - 'lib/api/group_import.rb'
     - 'lib/api/group_labels.rb'
-    - 'lib/api/group_packages.rb'
     - 'lib/api/group_variables.rb'
     - 'lib/api/groups.rb'
     - 'lib/api/helm_packages.rb'
@@ -2992,7 +2983,6 @@ Layout/LineLength:
     - 'lib/api/members.rb'
     - 'lib/api/merge_request_diffs.rb'
     - 'lib/api/merge_requests.rb'
-    - 'lib/api/metrics/dashboard/annotations.rb'
     - 'lib/api/metrics/user_starred_dashboards.rb'
     - 'lib/api/milestone_responses.rb'
     - 'lib/api/namespaces.rb'
@@ -3921,7 +3911,6 @@ Layout/LineLength:
     - 'spec/features/groups/settings/repository_spec.rb'
     - 'spec/features/groups_spec.rb'
     - 'spec/features/ide/static_object_external_storage_csp_spec.rb'
-    - 'spec/features/incidents/user_views_incident_spec.rb'
     - 'spec/features/invites_spec.rb'
     - 'spec/features/issuables/issuable_list_spec.rb'
     - 'spec/features/issuables/markdown_references/internal_references_spec.rb'
@@ -4012,7 +4001,6 @@ Layout/LineLength:
     - 'spec/features/projects/blobs/shortcuts_blob_spec.rb'
     - 'spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb'
     - 'spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb'
-    - 'spec/features/projects/branches_spec.rb'
     - 'spec/features/projects/ci/editor_spec.rb'
     - 'spec/features/projects/commit/cherry_pick_spec.rb'
     - 'spec/features/projects/commit/user_reverts_commit_spec.rb'
@@ -4185,11 +4173,11 @@ Layout/LineLength:
     - 'spec/graphql/resolvers/group_issues_resolver_spec.rb'
     - 'spec/graphql/resolvers/group_labels_resolver_spec.rb'
     - 'spec/graphql/resolvers/issue_status_counts_resolver_spec.rb'
-    - 'spec/graphql/resolvers/issues_resolver_spec.rb'
     - 'spec/graphql/resolvers/merge_requests_resolver_spec.rb'
     - 'spec/graphql/resolvers/metrics/dashboard_resolver_spec.rb'
     - 'spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb'
     - 'spec/graphql/resolvers/namespace_projects_resolver_spec.rb'
+    - 'spec/graphql/resolvers/project_issues_resolver_spec.rb'
     - 'spec/graphql/resolvers/project_jobs_resolver_spec.rb'
     - 'spec/graphql/resolvers/project_resolver_spec.rb'
     - 'spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb'
@@ -5543,7 +5531,6 @@ Layout/LineLength:
     - 'spec/services/members/destroy_service_spec.rb'
     - 'spec/services/members/invitation_reminder_email_service_spec.rb'
     - 'spec/services/members/unassign_issuables_service_spec.rb'
-    - 'spec/services/members/update_service_spec.rb'
     - 'spec/services/merge_requests/add_context_service_spec.rb'
     - 'spec/services/merge_requests/after_create_service_spec.rb'
     - 'spec/services/merge_requests/assign_issues_service_spec.rb'
@@ -5968,7 +5955,6 @@ Layout/LineLength:
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
     - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/search/_results.html.haml_spec.rb'
-    - 'spec/views/shared/access_tokens/_table.html.haml_spec.rb'
     - 'spec/views/shared/milestones/_issuable.html.haml_spec.rb'
     - 'spec/views/shared/projects/_project.html.haml_spec.rb'
     - 'spec/views/shared/snippets/_snippet.html.haml_spec.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index 9359939514b..f025680c209 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -69,7 +69,6 @@ Layout/SpaceInLambdaLiteral:
     - 'app/models/diff_note.rb'
     - 'app/models/environment.rb'
     - 'app/models/error_tracking/error.rb'
-    - 'app/models/event_collection.rb'
     - 'app/models/external_pull_request.rb'
     - 'app/models/group.rb'
     - 'app/models/integration.rb'
diff --git a/.rubocop_todo/layout/space_inside_parens.yml b/.rubocop_todo/layout/space_inside_parens.yml
index 805a9791409..e6238992619 100644
--- a/.rubocop_todo/layout/space_inside_parens.yml
+++ b/.rubocop_todo/layout/space_inside_parens.yml
@@ -1,103 +1,20 @@
 ---
-# Cop supports --auto-correct.
+# Cop supports --autocorrect.
 Layout/SpaceInsideParens:
   # Offense count: 701
   # Temporarily disabled due to too many offenses
   Enabled: false
   Exclude:
-    - 'app/controllers/projects/environments_controller.rb'
-    - 'app/controllers/projects/pipeline_schedules_controller.rb'
-    - 'app/graphql/mutations/ci/job/base.rb'
-    - 'app/helpers/icons_helper.rb'
-    - 'app/helpers/projects_helper.rb'
-    - 'app/helpers/reminder_emails_helper.rb'
-    - 'app/models/alert_management/alert.rb'
-    - 'app/models/ci/build_metadata.rb'
-    - 'app/models/concerns/milestoneable.rb'
-    - 'app/models/concerns/mirror_authentication.rb'
-    - 'app/models/concerns/protected_ref_access.rb'
-    - 'app/models/cycle_analytics/project_level_stage_adapter.rb'
-    - 'app/models/merge_request.rb'
-    - 'app/models/pages_domain.rb'
-    - 'app/models/project.rb'
-    - 'app/services/ci/archive_trace_service.rb'
-    - 'app/services/jira_import/start_import_service.rb'
-    - 'app/services/labels/transfer_service.rb'
-    - 'app/services/packages/debian/create_distribution_service.rb'
-    - 'app/services/packages/debian/update_distribution_service.rb'
-    - 'app/services/packages/npm/create_package_service.rb'
-    - 'app/services/personal_access_tokens/revoke_service.rb'
-    - 'app/services/snippets/create_service.rb'
-    - 'app/services/spam/spam_verdict_service.rb'
     - 'config/initializers/wikicloth_redos_patch.rb'
     - 'db/post_migrate/20210722042939_update_issuable_slas_where_issue_closed.rb'
-    - 'ee/app/graphql/resolvers/external_issue_resolver.rb'
-    - 'ee/app/helpers/billing_plans_helper.rb'
-    - 'ee/app/helpers/ee/boards_helper.rb'
-    - 'ee/app/models/ee/lfs_object.rb'
-    - 'ee/app/models/ee/merge_request_diff.rb'
-    - 'ee/app/models/ee/pages_deployment.rb'
-    - 'ee/app/models/ee/upload.rb'
-    - 'ee/app/models/requirements_management/requirement.rb'
-    - 'ee/app/models/resource_iteration_event.rb'
-    - 'ee/app/services/compliance_management/frameworks/create_service.rb'
-    - 'ee/app/services/compliance_management/frameworks/destroy_service.rb'
-    - 'ee/app/services/compliance_management/frameworks/update_service.rb'
-    - 'ee/app/services/elastic/cluster_reindexing_service.rb'
-    - 'ee/app/services/sitemap/create_service.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'
     - 'ee/lib/gitlab/auth/smartcard/session.rb'
-    - 'ee/spec/controllers/admin/licenses_controller_spec.rb'
-    - 'ee/spec/controllers/ee/groups_controller_spec.rb'
-    - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb'
-    - 'ee/spec/controllers/projects/issues_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/security/vulnerabilities_controller_spec.rb'
-    - 'ee/spec/controllers/projects/settings/operations_controller_spec.rb'
-    - 'ee/spec/features/account_recovery_regular_check_spec.rb'
-    - 'ee/spec/features/billings/billing_plans_spec.rb'
-    - 'ee/spec/features/boards/board_filters_spec.rb'
-    - 'ee/spec/features/boards/group_boards/board_deletion_spec.rb'
-    - 'ee/spec/features/boards/user_visits_board_spec.rb'
-    - 'ee/spec/features/groups/analytics/ci_cd_analytics_spec.rb'
-    - 'ee/spec/features/groups/issues_spec.rb'
-    - 'ee/spec/features/groups/iteration_spec.rb'
-    - 'ee/spec/features/groups/iterations/user_creates_iteration_in_cadence_spec.rb'
-    - 'ee/spec/features/groups/iterations/user_edits_iteration_cadence_spec.rb'
-    - 'ee/spec/features/groups/iterations/user_edits_iteration_spec.rb'
-    - 'ee/spec/features/merge_request/user_edits_multiple_reviewers_mr_spec.rb'
-    - 'ee/spec/features/merge_requests/user_resets_approvers_spec.rb'
-    - 'ee/spec/features/merge_requests/user_views_all_merge_requests_spec.rb'
-    - 'ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb'
     - 'ee/spec/finders/ee/alert_management/http_integrations_finder_spec.rb'
     - 'ee/spec/finders/epics_finder_spec.rb'
     - 'ee/spec/finders/security/pipeline_vulnerabilities_finder_spec.rb'
     - 'ee/spec/frontend/fixtures/analytics/devops_reports/devops_adoption/enabled_namespaces.rb'
     - 'ee/spec/frontend/fixtures/epic.rb'
     - 'ee/spec/frontend/fixtures/projects.rb'
-    - 'ee/spec/graphql/ee/resolvers/board_lists_resolver_spec.rb'
-    - 'ee/spec/graphql/mutations/app_sec/fuzzing/coverage/corpus/create_spec.rb'
-    - 'ee/spec/graphql/mutations/dast/profiles/create_spec.rb'
-    - 'ee/spec/graphql/resolvers/epics_resolver_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/drop_invalid_remediations_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/dynamic_settings_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/group_lookup_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/smartcard/ldap_certificate_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/coverage_fuzzing_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_api_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_api_latest_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_latest_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_runner_validation_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/git_ssh_proxy_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/log_cursor/events/event_spec.rb'
-    - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb'
-    - 'ee/spec/lib/gitlab/status_page/storage/s3_client_spec.rb'
     - 'ee/spec/mailers/notify_spec.rb'
     - 'ee/spec/migrations/add_non_null_constraint_for_escalation_rule_on_pending_alert_escalations_spec.rb'
     - 'ee/spec/migrations/drop_invalid_remediations_spec.rb'
@@ -171,70 +88,11 @@ Layout/SpaceInsideParens:
     - 'qa/qa/tools/delete_subgroups.rb'
     - 'qa/spec/runtime/feature_spec.rb'
     - 'qa/spec/scenario/template_spec.rb'
-    - 'spec/controllers/boards/issues_controller_spec.rb'
-    - 'spec/controllers/groups/children_controller_spec.rb'
-    - 'spec/controllers/groups/registry/repositories_controller_spec.rb'
-    - 'spec/controllers/groups/releases_controller_spec.rb'
-    - 'spec/controllers/groups/runners_controller_spec.rb'
-    - 'spec/controllers/groups_controller_spec.rb'
-    - 'spec/controllers/omniauth_callbacks_controller_spec.rb'
-    - 'spec/controllers/projects/environments_controller_spec.rb'
-    - 'spec/controllers/projects/issues_controller_spec.rb'
-    - 'spec/controllers/projects/registry/repositories_controller_spec.rb'
-    - 'spec/controllers/projects/runners_controller_spec.rb'
     - 'spec/dependencies/omniauth_saml_spec.rb'
     - 'spec/factories/usage_data.rb'
-    - 'spec/features/boards/board_filters_spec.rb'
-    - 'spec/features/boards/user_visits_board_spec.rb'
-    - 'spec/features/dashboard/datetime_on_tooltips_spec.rb'
-    - 'spec/features/graphql_known_operations_spec.rb'
-    - 'spec/features/groups/activity_spec.rb'
-    - 'spec/features/groups/board_sidebar_spec.rb'
-    - 'spec/features/groups/empty_states_spec.rb'
-    - 'spec/features/groups/issues_spec.rb'
-    - 'spec/features/groups/milestone_spec.rb'
-    - 'spec/features/groups/milestones_sorting_spec.rb'
-    - 'spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb'
-    - 'spec/features/merge_request/user_edits_assignees_sidebar_spec.rb'
-    - 'spec/features/profiles/two_factor_auths_spec.rb'
-    - 'spec/features/projects/branches/user_views_branches_spec.rb'
-    - 'spec/features/projects/fork_spec.rb'
-    - 'spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb'
-    - 'spec/features/projects/jobs_spec.rb'
-    - 'spec/features/projects/pipeline_schedules_spec.rb'
-    - 'spec/features/projects/releases/user_views_edit_release_spec.rb'
-    - 'spec/features/projects/releases/user_views_releases_spec.rb'
     - 'spec/finders/alert_management/http_integrations_finder_spec.rb'
     - 'spec/finders/events_finder_spec.rb'
     - 'spec/finders/labels_finder_spec.rb'
-    - 'spec/frontend/fixtures/api_merge_requests.rb'
-    - 'spec/frontend/fixtures/api_projects.rb'
-    - 'spec/frontend/fixtures/application_settings.rb'
-    - 'spec/frontend/fixtures/blob.rb'
-    - 'spec/frontend/fixtures/branches.rb'
-    - 'spec/frontend/fixtures/clusters.rb'
-    - 'spec/frontend/fixtures/deploy_keys.rb'
-    - 'spec/frontend/fixtures/issues.rb'
-    - 'spec/frontend/fixtures/jobs.rb'
-    - 'spec/frontend/fixtures/labels.rb'
-    - 'spec/frontend/fixtures/merge_requests.rb'
-    - 'spec/frontend/fixtures/merge_requests_diffs.rb'
-    - 'spec/frontend/fixtures/metrics_dashboard.rb'
-    - 'spec/frontend/fixtures/pipeline_schedules.rb'
-    - 'spec/frontend/fixtures/pipelines.rb'
-    - 'spec/frontend/fixtures/projects.rb'
-    - 'spec/frontend/fixtures/raw.rb'
-    - 'spec/frontend/fixtures/snippet.rb'
-    - 'spec/frontend/fixtures/todos.rb'
-    - 'spec/graphql/mutations/todos/restore_many_spec.rb'
-    - 'spec/graphql/resolvers/board_list_issues_resolver_spec.rb'
-    - 'spec/graphql/resolvers/board_lists_resolver_spec.rb'
-    - 'spec/graphql/resolvers/board_resolver_spec.rb'
-    - 'spec/graphql/resolvers/boards_resolver_spec.rb'
-    - 'spec/graphql/resolvers/group_packages_resolver_spec.rb'
-    - 'spec/graphql/resolvers/projects_resolver_spec.rb'
-    - 'spec/graphql/resolvers/recent_boards_resolver_spec.rb'
-    - 'spec/graphql/resolvers/users_resolver_spec.rb'
     - 'spec/helpers/badges_helper_spec.rb'
     - 'spec/helpers/ci/builds_helper_spec.rb'
     - 'spec/helpers/ci/runners_helper_spec.rb'
@@ -323,55 +181,9 @@ Layout/SpaceInsideParens:
     - 'spec/migrations/20211130165043_backfill_sequence_column_for_sprints_table_spec.rb'
     - 'spec/migrations/backfill_issues_upvotes_count_spec.rb'
     - 'spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb'
-    - 'spec/models/ci/build_spec.rb'
-    - 'spec/models/ci/build_trace_spec.rb'
-    - 'spec/models/ci/pipeline_spec.rb'
-    - 'spec/models/ci/trigger_request_spec.rb'
-    - 'spec/models/clusters/applications/prometheus_spec.rb'
-    - 'spec/models/deploy_token_spec.rb'
-    - 'spec/models/environment_spec.rb'
-    - 'spec/models/environment_status_spec.rb'
-    - 'spec/models/experiment_spec.rb'
-    - 'spec/models/exported_protected_branch_spec.rb'
-    - 'spec/models/group_spec.rb'
-    - 'spec/models/integrations/jira_spec.rb'
-    - 'spec/models/member_spec.rb'
-    - 'spec/models/metrics/dashboard/annotation_spec.rb'
-    - 'spec/models/namespace_setting_spec.rb'
-    - 'spec/models/namespace_spec.rb'
-    - 'spec/models/network/graph_spec.rb'
-    - 'spec/models/packages/package_spec.rb'
-    - 'spec/models/project_spec.rb'
-    - 'spec/models/repository_spec.rb'
-    - 'spec/models/users/calloutable_spec.rb'
     - 'spec/policies/clusters/agent_policy_spec.rb'
     - 'spec/presenters/ci/build_presenter_spec.rb'
     - 'spec/presenters/packages/conan/package_presenter_spec.rb'
-    - 'spec/requests/api/boards_spec.rb'
-    - 'spec/requests/api/ci/runner/jobs_artifacts_spec.rb'
-    - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb'
-    - 'spec/requests/api/ci/runners_reset_registration_token_spec.rb'
-    - 'spec/requests/api/ci/runners_spec.rb'
-    - 'spec/requests/api/dependency_proxy_spec.rb'
-    - 'spec/requests/api/deployments_spec.rb'
-    - 'spec/requests/api/files_spec.rb'
-    - 'spec/requests/api/go_proxy_spec.rb'
-    - 'spec/requests/api/graphql/boards/board_list_issues_query_spec.rb'
-    - 'spec/requests/api/graphql/ci/jobs_spec.rb'
-    - 'spec/requests/api/graphql/ci/pipelines_spec.rb'
-    - 'spec/requests/api/graphql/mutations/award_emojis/remove_spec.rb'
-    - 'spec/requests/api/graphql/mutations/award_emojis/toggle_spec.rb'
-    - 'spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb'
-    - 'spec/requests/api/group_boards_spec.rb'
-    - 'spec/requests/api/issues/issues_spec.rb'
-    - 'spec/requests/api/issues/post_projects_issues_spec.rb'
-    - 'spec/requests/api/labels_spec.rb'
-    - 'spec/requests/api/merge_requests_spec.rb'
-    - 'spec/requests/api/pages/pages_spec.rb'
-    - 'spec/requests/api/project_milestones_spec.rb'
-    - 'spec/requests/api/project_snippets_spec.rb'
-    - 'spec/requests/api/snippets_spec.rb'
-    - 'spec/requests/api/submodules_spec.rb'
     - 'spec/requests/jwt_controller_spec.rb'
     - 'spec/requests/projects/merge_requests/diffs_spec.rb'
     - 'spec/requests/projects/merge_requests_spec.rb'
@@ -379,28 +191,6 @@ Layout/SpaceInsideParens:
     - 'spec/requests/search_controller_spec.rb'
     - 'spec/serializers/analytics_build_entity_spec.rb'
     - 'spec/serializers/merge_request_user_entity_spec.rb'
-    - 'spec/services/boards/issues/list_service_spec.rb'
-    - 'spec/services/ci/compare_test_reports_service_spec.rb'
-    - 'spec/services/ci/pipeline_processing/atomic_processing_service/status_collection_spec.rb'
-    - 'spec/services/ci/retry_job_service_spec.rb'
-    - 'spec/services/clusters/gcp/provision_service_spec.rb'
-    - 'spec/services/clusters/gcp/verify_provision_status_service_spec.rb'
-    - 'spec/services/groups/destroy_service_spec.rb'
-    - 'spec/services/groups/update_shared_runners_service_spec.rb'
-    - 'spec/services/import/gitlab_projects/file_acquisition_strategies/file_upload_spec.rb'
-    - 'spec/services/issues/export_csv_service_spec.rb'
-    - 'spec/services/labels/promote_service_spec.rb'
-    - 'spec/services/members/invite_service_spec.rb'
-    - 'spec/services/notes/update_service_spec.rb'
-    - 'spec/services/packages/composer/composer_json_service_spec.rb'
-    - 'spec/services/packages/npm/create_package_service_spec.rb'
-    - 'spec/services/projects/lfs_pointers/lfs_download_service_spec.rb'
-    - 'spec/services/search/group_service_spec.rb'
-    - 'spec/services/security/merge_reports_service_spec.rb'
-    - 'spec/services/suggestions/apply_service_spec.rb'
-    - 'spec/services/system_notes/issuables_service_spec.rb'
-    - 'spec/services/users/destroy_service_spec.rb'
-    - 'spec/services/x509_certificate_revoke_service_spec.rb'
     - 'spec/support/helpers/database/partitioning_helpers.rb'
     - 'spec/support/helpers/dependency_proxy_helpers.rb'
     - 'spec/support/helpers/javascript_fixtures_helpers.rb'
diff --git a/.rubocop_todo/layout/trailing_whitespace.yml b/.rubocop_todo/layout/trailing_whitespace.yml
index d9c88c989e0..8e3e0795c03 100644
--- a/.rubocop_todo/layout/trailing_whitespace.yml
+++ b/.rubocop_todo/layout/trailing_whitespace.yml
@@ -1,7 +1,6 @@
 ---
 # Cop supports --auto-correct.
 Layout/TrailingWhitespace:
-  Details: grace period
   Exclude:
     - 'app/models/concerns/analytics/cycle_analytics/stage_event_model.rb'
     - 'db/migrate/20210611100359_rebuild_index_for_cadence_iterations_automation.rb'