Add latest changes from gitlab-org/gitlab@master

6 files changed, 60 insertions, 57 deletions

diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml
index fb69a08e2d9..94cba6f59bf 100644
--- a/.rubocop_todo/layout/hash_alignment.yml
+++ b/.rubocop_todo/layout/hash_alignment.yml
@@ -28,26 +28,6 @@ Layout/HashAlignment:
     - 'ee/app/graphql/ee/types/merge_request_type.rb'
     - 'ee/app/graphql/ee/types/project_type.rb'
     - 'ee/app/graphql/ee/types/query_type.rb'
-    - 'ee/app/graphql/mutations/iterations/cadences/create.rb'
-    - 'ee/app/graphql/mutations/iterations/cadences/update.rb'
-    - 'ee/app/graphql/mutations/iterations/delete.rb'
-    - 'ee/app/graphql/mutations/projects/set_locked.rb'
-    - 'ee/app/graphql/resolvers/iterations/cadences_resolver.rb'
-    - 'ee/app/graphql/resolvers/vulnerabilities_count_per_day_resolver.rb'
-    - 'ee/app/graphql/types/admin/cloud_licenses/current_license_type.rb'
-    - 'ee/app/graphql/types/admin/cloud_licenses/license_type.rb'
-    - 'ee/app/graphql/types/admin/cloud_licenses/subscription_future_entry_type.rb'
-    - 'ee/app/graphql/types/analytics/devops_adoption/enabled_namespace_type.rb'
-    - 'ee/app/graphql/types/analytics/devops_adoption/snapshot_type.rb'
-    - 'ee/app/graphql/types/app_sec/fuzzing/api/ci_configuration_type.rb'
-    - 'ee/app/graphql/types/app_sec/fuzzing/api/scan_profile_type.rb'
-    - 'ee/app/graphql/types/app_sec/fuzzing/coverage/corpus_type.rb'
-    - 'ee/app/graphql/types/boards/epic_board_type.rb'
-    - 'ee/app/graphql/types/boards/epic_list_type.rb'
-    - 'ee/app/graphql/types/boards/epic_user_preferences_type.rb'
-    - 'ee/app/graphql/types/burnup_chart_daily_totals_type.rb'
-    - 'ee/app/graphql/types/ci/code_coverage_activity_type.rb'
-    - 'ee/app/graphql/types/ci/code_quality_degradation_type.rb'
     - 'ee/app/graphql/types/ci/namespace_ci_cd_setting_type.rb'
     - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_type.rb'
     - 'ee/app/graphql/types/dast/profile_schedule_type.rb'
@@ -224,7 +204,6 @@ Layout/HashAlignment:
     - 'ee/spec/services/status_page/unpublish_details_service_spec.rb'
     - 'ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb'
     - 'ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb'
-    - 'ee/spec/services/vulnerabilities/security_finding/create_issue_service_spec.rb'
     - 'ee/spec/support/shared_examples/services/audit_event_logging_shared_examples.rb'
     - 'ee/spec/support/shared_examples/status_page/publish_shared_examples.rb'
     - 'ee/spec/support/shared_examples/status_page/reference_links_examples.rb'
diff --git a/.rubocop_todo/style/hash_as_last_array_item.yml b/.rubocop_todo/style/hash_as_last_array_item.yml
index eec2e77eafd..384d2dc5fce 100644
--- a/.rubocop_todo/style/hash_as_last_array_item.yml
+++ b/.rubocop_todo/style/hash_as_last_array_item.yml
@@ -1,15 +1,11 @@
 ---
 # Cop supports --auto-correct.
 Style/HashAsLastArrayItem:
-  # Offense count: 79
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
     - 'app/controllers/admin/application_settings_controller.rb'
     - 'app/controllers/admin/groups_controller.rb'
     - 'app/controllers/admin/users_controller.rb'
     - 'app/controllers/boards/issues_controller.rb'
-    - 'app/controllers/clusters/clusters_controller.rb'
     - 'app/controllers/concerns/issuable_actions.rb'
     - 'app/controllers/concerns/issuable_collections.rb'
     - 'app/controllers/profiles_controller.rb'
@@ -29,6 +25,7 @@ Style/HashAsLastArrayItem:
     - 'app/models/customer_relations/contact.rb'
     - 'app/models/customer_relations/organization.rb'
     - 'app/models/deploy_key.rb'
+    - 'app/models/deployment.rb'
     - 'app/models/issue.rb'
     - 'app/models/merge_request.rb'
     - 'app/models/milestone.rb'
@@ -59,4 +56,5 @@ Style/HashAsLastArrayItem:
     - 'spec/services/git/branch_hooks_service_spec.rb'
     - 'spec/services/metrics/dashboard/panel_preview_service_spec.rb'
     - 'spec/support/helpers/rack_attack_spec_helpers.rb'
+    - 'spec/workers/concerns/worker_attributes_spec.rb'
     - 'spec/workers/merge_worker_spec.rb'
diff --git a/.rubocop_todo/style/hash_each_methods.yml b/.rubocop_todo/style/hash_each_methods.yml
index 648b6fbbe08..cebfe5c0c7d 100644
--- a/.rubocop_todo/style/hash_each_methods.yml
+++ b/.rubocop_todo/style/hash_each_methods.yml
@@ -1,9 +1,6 @@
 ---
 # Cop supports --auto-correct.
 Style/HashEachMethods:
-  # Offense count: 95
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
     - 'app/graphql/resolvers/concerns/caching_array_resolver.rb'
     - 'app/graphql/types/alert_management/severity_enum.rb'
@@ -12,6 +9,7 @@ Style/HashEachMethods:
     - 'app/graphql/types/ci/job_artifact_file_type_enum.rb'
     - 'app/graphql/types/ci/pipeline_config_source_enum.rb'
     - 'app/graphql/types/ci/runner_access_level_enum.rb'
+    - 'app/graphql/types/ci/variable_type_enum.rb'
     - 'app/graphql/types/clusters/agent_token_status_enum.rb'
     - 'app/graphql/types/container_repository_status_enum.rb'
     - 'app/graphql/types/data_visualization_palette/color_enum.rb'
@@ -34,6 +32,7 @@ Style/HashEachMethods:
     - 'config/initializers/8_gitaly.rb'
     - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_reason_enum.rb'
     - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_severity_enum.rb'
+    - 'ee/app/graphql/types/incident_management/issuable_resource_link_type_enum.rb'
     - 'ee/app/graphql/types/incident_management/oncall_rotation_length_unit_enum.rb'
     - 'ee/app/graphql/types/security_report_summary_type.rb'
     - 'ee/app/graphql/types/vulnerabilities_count_by_day_type.rb'
@@ -69,7 +68,6 @@ Style/HashEachMethods:
     - 'spec/helpers/application_helper_spec.rb'
     - 'spec/lib/gitlab/ci/status/build/failed_spec.rb'
     - 'spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb'
-    - 'spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb'
     - 'spec/lib/gitlab/usage_data_spec.rb'
     - 'spec/models/ci/build_spec.rb'
     - 'spec/models/ci/job_artifact_spec.rb'
@@ -77,6 +75,7 @@ Style/HashEachMethods:
     - 'spec/models/clusters/cluster_spec.rb'
     - 'spec/models/concerns/has_user_type_spec.rb'
     - 'spec/models/packages/package_spec.rb'
+    - 'spec/models/project_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/presenters/ci/pipeline_presenter_spec.rb'
     - 'spec/presenters/commit_status_presenter_spec.rb'
diff --git a/.rubocop_todo/style/redundant_self.yml b/.rubocop_todo/style/redundant_self.yml
index 9951160ae02..65f2ea327d7 100644
--- a/.rubocop_todo/style/redundant_self.yml
+++ b/.rubocop_todo/style/redundant_self.yml
@@ -1,12 +1,11 @@
 ---
 # Cop supports --auto-correct.
 Style/RedundantSelf:
-  # Offense count: 1222
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
+    - 'app/channels/awareness_channel.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/finders/security/jobs_finder.rb'
+    - 'app/graphql/types/permission_types/base_permission_type.rb'
     - 'app/models/abuse_report.rb'
     - 'app/models/analytics/usage_trends/measurement.rb'
     - 'app/models/application_record.rb'
@@ -74,6 +73,7 @@ Style/RedundantSelf:
     - 'app/models/concerns/merge_request_reviewer_state.rb'
     - 'app/models/concerns/noteable.rb'
     - 'app/models/concerns/packages/debian/distribution.rb'
+    - 'app/models/concerns/participable.rb'
     - 'app/models/concerns/pg_full_text_searchable.rb'
     - 'app/models/concerns/protected_ref.rb'
     - 'app/models/concerns/protected_ref_access.rb'
@@ -102,6 +102,7 @@ Style/RedundantSelf:
     - 'app/models/gpg_key.rb'
     - 'app/models/group.rb'
     - 'app/models/group_group_link.rb'
+    - 'app/models/hooks/web_hook_log.rb'
     - 'app/models/identity.rb'
     - 'app/models/integration.rb'
     - 'app/models/integrations/base_chat_notification.rb'
@@ -112,6 +113,7 @@ Style/RedundantSelf:
     - 'app/models/integrations/emails_on_push.rb'
     - 'app/models/integrations/jira.rb'
     - 'app/models/integrations/pipelines_email.rb'
+    - 'app/models/integrations/slack.rb'
     - 'app/models/integrations/zentao.rb'
     - 'app/models/internal_id.rb'
     - 'app/models/issue.rb'
@@ -125,11 +127,10 @@ Style/RedundantSelf:
     - 'app/models/member.rb'
     - 'app/models/members/project_member.rb'
     - 'app/models/merge_request.rb'
+    - 'app/models/merge_request/cleanup_schedule.rb'
     - 'app/models/merge_request/metrics.rb'
-    - 'app/models/merge_request_assignee.rb'
     - 'app/models/merge_request_diff.rb'
     - 'app/models/merge_request_diff_commit.rb'
-    - 'app/models/merge_request_reviewer.rb'
     - 'app/models/namespaces/traversal/linear.rb'
     - 'app/models/note.rb'
     - 'app/models/packages/dependency.rb'
@@ -179,10 +180,11 @@ Style/RedundantSelf:
     - 'app/uploaders/gitlab_uploader.rb'
     - 'app/uploaders/object_storage.rb'
     - 'app/workers/background_migration/single_database_worker.rb'
+    - 'app/workers/build_hooks_worker.rb'
     - 'app/workers/concerns/application_worker.rb'
     - 'app/workers/concerns/limited_capacity/worker.rb'
     - 'app/workers/concerns/project_start_import.rb'
-    - 'app/workers/concerns/waitable_worker.rb'
+    - 'app/workers/concerns/reenqueuer.rb'
     - 'app/workers/database/batched_background_migration/single_database_worker.rb'
     - 'app/workers/group_import_worker.rb'
     - 'app/workers/project_export_worker.rb'
@@ -193,6 +195,7 @@ Style/RedundantSelf:
     - 'db/post_migrate/20210329102724_add_new_trail_plans.rb'
     - 'db/post_migrate/20211029102822_add_open_source_plan.rb'
     - 'ee/app/graphql/resolvers/geo/registries_resolver.rb'
+    - 'ee/app/models/approval_merge_request_rule.rb'
     - 'ee/app/models/approval_project_rule.rb'
     - 'ee/app/models/concerns/approval_rule_like.rb'
     - 'ee/app/models/concerns/custom_model_naming.rb'
@@ -216,9 +219,12 @@ Style/RedundantSelf:
     - 'ee/app/models/ee/description_version.rb'
     - 'ee/app/models/ee/environment.rb'
     - 'ee/app/models/ee/epic.rb'
+    - 'ee/app/models/ee/group.rb'
     - 'ee/app/models/ee/group_member.rb'
     - 'ee/app/models/ee/issue.rb'
     - 'ee/app/models/ee/iteration.rb'
+    - 'ee/app/models/ee/member.rb'
+    - 'ee/app/models/ee/merge_request.rb'
     - 'ee/app/models/ee/namespace.rb'
     - 'ee/app/models/ee/packages/package_file.rb'
     - 'ee/app/models/ee/project.rb'
@@ -247,13 +253,17 @@ Style/RedundantSelf:
     - 'ee/lib/ee/gitlab/auth/ldap/sync/groups.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/sync/proxy.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/sync/users.rb'
+    - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb'
+    - 'ee/lib/ee/gitlab/background_migration/delete_invalid_epic_issues.rb'
     - 'ee/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings.rb'
+    - 'ee/lib/ee/gitlab/database.rb'
     - 'ee/lib/ee/gitlab/tracking.rb'
     - 'ee/lib/ee/legacy_model.rb'
     - 'ee/lib/ee/model.rb'
     - 'ee/lib/elastic/instance_proxy_util.rb'
     - 'ee/lib/elastic/latest/application_class_proxy.rb'
+    - 'ee/lib/elastic/latest/commit_config.rb'
     - 'ee/lib/elastic/latest/issue_config.rb'
     - 'ee/lib/elastic/latest/merge_request_config.rb'
     - 'ee/lib/elastic/latest/note_config.rb'
@@ -275,9 +285,9 @@ Style/RedundantSelf:
     - 'ee/lib/gitlab/geo/oauth/logout_state.rb'
     - 'ee/lib/gitlab/geo/replicator.rb'
     - 'ee/lib/gitlab/template/custom_template.rb'
+    - 'ee/lib/system_check/app/search_check.rb'
     - 'ee/spec/helpers/ee/feature_flags_helper_spec.rb'
     - 'ee/spec/helpers/ee/graph_helper_spec.rb'
-    - 'ee/spec/models/geo/deleted_project_spec.rb'
     - 'lib/api/entities/wiki_attachment.rb'
     - 'lib/api/helpers.rb'
     - 'lib/api/helpers/packages_helpers.rb'
@@ -328,6 +338,7 @@ Style/RedundantSelf:
     - 'lib/gitlab/database/load_balancing/service_discovery.rb'
     - 'lib/gitlab/database/loose_foreign_keys.rb'
     - 'lib/gitlab/database/migration_helpers/restrict_gitlab_schema.rb'
+    - 'lib/gitlab/database/migrations/background_migration_helpers.rb'
     - 'lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb'
     - 'lib/gitlab/database/query_analyzers/base.rb'
     - 'lib/gitlab/database/query_analyzers/prevent_cross_database_modification.rb'
@@ -339,6 +350,7 @@ Style/RedundantSelf:
     - 'lib/gitlab/diff/file.rb'
     - 'lib/gitlab/diff/rendered/notebook/diff_file.rb'
     - 'lib/gitlab/email/smtp_config.rb'
+    - 'lib/gitlab/error_tracking/logger.rb'
     - 'lib/gitlab/feature_categories.rb'
     - 'lib/gitlab/git.rb'
     - 'lib/gitlab/git/blob.rb'
@@ -347,6 +359,7 @@ Style/RedundantSelf:
     - 'lib/gitlab/git/tree.rb'
     - 'lib/gitlab/git_access.rb'
     - 'lib/gitlab/github_import.rb'
+    - 'lib/gitlab/graphql/deprecations_base.rb'
     - 'lib/gitlab/graphql/known_operations.rb'
     - 'lib/gitlab/graphql/lazy.rb'
     - 'lib/gitlab/graphql/representation/submodule_tree_entry.rb'
@@ -399,10 +412,10 @@ Style/RedundantSelf:
     - 'lib/system_check/rake_task/rake_task_helpers.rb'
     - 'lib/uploaded_file.rb'
     - 'qa/lib/gitlab/page/main/sign_up.rb'
-    - 'qa/qa/git/repository.rb'
     - 'qa/qa/page/validatable.rb'
     - 'qa/qa/resource/base.rb'
     - 'qa/qa/resource/events/project.rb'
+    - 'qa/qa/resource/personal_access_token.rb'
     - 'qa/qa/resource/protected_branch.rb'
     - 'qa/qa/resource/reusable.rb'
     - 'qa/qa/resource/user_gpg.rb'
@@ -416,6 +429,8 @@ Style/RedundantSelf:
     - 'spec/helpers/graph_helper_spec.rb'
     - 'spec/helpers/ide_helper_spec.rb'
     - 'spec/helpers/submodule_helper_spec.rb'
+    - 'spec/lib/gitlab/background_task_spec.rb'
     - 'spec/lib/gitlab/database/load_balancing_spec.rb'
+    - 'spec/models/integration_spec.rb'
     - 'spec/support/before_all_adapter.rb'
     - 'spec/support/cycle_analytics_helpers/test_generation.rb'
diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index 8c8dbf86b1c..2330683cc18 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -1,10 +1,8 @@
 ---
 # Cop supports --auto-correct.
 Style/StringConcatenation:
-  # Offense count: 611
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
+    - 'app/components/pajamas/button_component.rb'
     - 'app/controllers/concerns/creates_commit.rb'
     - 'app/controllers/groups/dependency_proxy_for_containers_controller.rb'
     - 'app/controllers/jira_connect/app_descriptor_controller.rb'
@@ -45,7 +43,6 @@ Style/StringConcatenation:
     - 'app/services/packages/debian/generate_distribution_key_service.rb'
     - 'app/services/packages/debian/generate_distribution_service.rb'
     - 'app/services/pages/zip_directory_service.rb'
-    - 'app/services/projects/update_pages_service.rb'
     - 'app/services/repositories/base_service.rb'
     - 'app/services/verify_pages_domain_service.rb'
     - 'app/uploaders/gitlab_uploader.rb'
@@ -56,6 +53,7 @@ Style/StringConcatenation:
     - 'db/migrate/20210412111213_create_security_orchestration_policy_rule_schedule.rb'
     - 'ee/app/controllers/admin/elasticsearch_controller.rb'
     - 'ee/app/finders/ee/issuables/label_filter.rb'
+    - 'ee/app/helpers/ee/geo_helper.rb'
     - 'ee/app/helpers/ee/gitlab_routing_helper.rb'
     - 'ee/app/helpers/ee/mirror_helper.rb'
     - 'ee/app/helpers/ee/search_helper.rb'
@@ -70,6 +68,7 @@ Style/StringConcatenation:
     - 'ee/lib/api/project_mirror.rb'
     - 'ee/lib/ee/audit/project_changes_auditor.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/person.rb'
+    - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'ee/lib/elastic/latest/git_class_proxy.rb'
@@ -81,7 +80,6 @@ Style/StringConcatenation:
     - 'ee/spec/controllers/trial_registrations_controller_spec.rb'
     - 'ee/spec/features/boards/boards_spec.rb'
     - 'ee/spec/features/projects/pipelines/pipeline_spec.rb'
-    - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
     - 'ee/spec/helpers/search_helper_spec.rb'
     - 'ee/spec/lib/gitlab/auth/ldap/person_spec.rb'
     - 'ee/spec/lib/gitlab/auth/o_auth/user_spec.rb'
@@ -94,8 +92,8 @@ Style/StringConcatenation:
     - 'ee/spec/models/dast_site_validation_spec.rb'
     - 'ee/spec/models/ee/audit_event_spec.rb'
     - 'ee/spec/models/geo_node_spec.rb'
+    - 'ee/spec/models/incident_management/issuable_resource_link_spec.rb'
     - 'ee/spec/models/status_page/project_setting_spec.rb'
-    - 'ee/spec/requests/api/internal/kubernetes_spec.rb'
     - 'ee/spec/services/jira/jql_builder_service_spec.rb'
     - 'ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb'
     - 'ee/spec/services/todo_service_spec.rb'
@@ -138,6 +136,7 @@ Style/StringConcatenation:
     - 'lib/gitlab/kubernetes/kubectl_cmd.rb'
     - 'lib/gitlab/lfs/client.rb'
     - 'lib/gitlab/logger.rb'
+    - 'lib/gitlab/pages/deployment_update.rb'
     - 'lib/gitlab/path_regex.rb'
     - 'lib/gitlab/prometheus/internal.rb'
     - 'lib/gitlab/quick_actions/extractor.rb'
@@ -150,6 +149,7 @@ Style/StringConcatenation:
     - 'lib/gitlab/throttle.rb'
     - 'lib/gitlab/time_tracking_formatter.rb'
     - 'lib/gitlab/untrusted_regexp.rb'
+    - 'lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb'
     - 'lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb'
     - 'lib/gitlab/usage_data_queries.rb'
     - 'lib/google_api/cloud_platform/client.rb'
@@ -163,8 +163,8 @@ Style/StringConcatenation:
     - 'qa/qa/page/milestone/new.rb'
     - 'qa/qa/page/project/milestone/new.rb'
     - 'qa/qa/page/project/settings/deploy_tokens.rb'
+    - 'qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb'
-    - 'qa/qa/support/page_error_checker.rb'
     - 'qa/qa/tools/generate_perf_testdata.rb'
     - 'scripts/perf/gc/print_gc_stats.rb'
     - 'scripts/perf/query_limiting_report.rb'
@@ -230,7 +230,6 @@ Style/StringConcatenation:
     - 'spec/lib/gitlab/gitaly_client/repository_service_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/wiki_service_spec.rb'
     - 'spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/kube_client_spec.rb'
     - 'spec/lib/gitlab/lfs/client_spec.rb'
     - 'spec/lib/gitlab/other_markup_spec.rb'
     - 'spec/lib/gitlab/path_regex_spec.rb'
@@ -246,6 +245,7 @@ Style/StringConcatenation:
     - 'spec/lib/gitlab/tree_summary_spec.rb'
     - 'spec/lib/gitlab/url_blocker_spec.rb'
     - 'spec/lib/gitlab/utils_spec.rb'
+    - 'spec/lib/gitlab/visibility_level_spec.rb'
     - 'spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb'
     - 'spec/lib/gitlab/workhorse_spec.rb'
     - 'spec/lib/kramdown/kramdown_spec.rb'
@@ -288,12 +288,14 @@ Style/StringConcatenation:
     - 'spec/requests/api/merge_requests_spec.rb'
     - 'spec/requests/api/notes_spec.rb'
     - 'spec/requests/api/pypi_packages_spec.rb'
+    - 'spec/requests/users_controller_spec.rb'
     - 'spec/routing/git_http_routing_spec.rb'
     - 'spec/services/ci/find_exposed_artifacts_service_spec.rb'
     - 'spec/services/clusters/gcp/finalize_creation_service_spec.rb'
     - 'spec/services/clusters/kubernetes/configure_istio_ingress_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb'
     - 'spec/services/error_tracking/list_projects_service_spec.rb'
+    - 'spec/services/groups/update_service_spec.rb'
     - 'spec/services/merge_requests/build_service_spec.rb'
     - 'spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb'
     - 'spec/services/packages/conan/create_package_file_service_spec.rb'
@@ -303,6 +305,7 @@ Style/StringConcatenation:
     - 'spec/services/projects/create_service_spec.rb'
     - 'spec/services/projects/destroy_service_spec.rb'
     - 'spec/services/projects/download_service_spec.rb'
+    - 'spec/services/projects/update_service_spec.rb'
     - 'spec/services/push_event_payload_service_spec.rb'
     - 'spec/services/repositories/destroy_service_spec.rb'
     - 'spec/services/snippets/bulk_destroy_service_spec.rb'
@@ -323,9 +326,9 @@ Style/StringConcatenation:
     - 'spec/support/shared_examples/lib/banzai/reference_parser_shared_examples.rb'
     - 'spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb'
     - 'spec/support/shared_examples/models/wiki_shared_examples.rb'
+    - 'spec/support/shared_examples/requests/api/hooks_shared_examples.rb'
     - 'spec/support/shared_examples/requests/snippet_shared_examples.rb'
     - 'spec/support/unpack-gitlab-git-test'
-    - 'spec/tasks/gitlab/backup_rake_spec.rb'
     - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb'
     - 'spec/uploaders/job_artifact_uploader_spec.rb'
     - 'spec/validators/addressable_url_validator_spec.rb'
diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml
index ea3a505d2da..770b99109b4 100644
--- a/.rubocop_todo/style/symbol_proc.yml
+++ b/.rubocop_todo/style/symbol_proc.yml
@@ -1,9 +1,6 @@
 ---
 # Cop supports --auto-correct.
 Style/SymbolProc:
-  # Offense count: 341
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
     - 'app/controllers/admin/users_controller.rb'
     - 'app/controllers/concerns/renders_blob.rb'
@@ -14,7 +11,10 @@ Style/SymbolProc:
     - 'app/controllers/profiles_controller.rb'
     - 'app/finders/packages/go/version_finder.rb'
     - 'app/graphql/mutations/commits/create.rb'
+    - 'app/graphql/mutations/concerns/mutations/work_items/widgetable.rb'
     - 'app/graphql/mutations/jira_import/start.rb'
+    - 'app/graphql/mutations/work_items/update_widgets.rb'
+    - 'app/graphql/types/work_items/widgets/description_type.rb'
     - 'app/helpers/graph_helper.rb'
     - 'app/models/ci/build_metadata.rb'
     - 'app/models/ci/build_trace_chunk.rb'
@@ -24,6 +24,7 @@ Style/SymbolProc:
     - 'app/models/concerns/board_recent_visit.rb'
     - 'app/models/concerns/resolvable_discussion.rb'
     - 'app/models/container_repository.rb'
+    - 'app/models/deployment.rb'
     - 'app/models/discussion.rb'
     - 'app/models/environment.rb'
     - 'app/models/integrations/prometheus.rb'
@@ -43,11 +44,9 @@ Style/SymbolProc:
     - 'app/serializers/build_details_entity.rb'
     - 'app/serializers/ci/pipeline_entity.rb'
     - 'app/serializers/ci/trigger_entity.rb'
-    - 'app/serializers/cluster_entity.rb'
     - 'app/serializers/deployment_cluster_entity.rb'
     - 'app/serializers/deployment_entity.rb'
     - 'app/serializers/draft_note_entity.rb'
-    - 'app/serializers/environment_entity.rb'
     - 'app/serializers/import/bitbucket_provider_repo_entity.rb'
     - 'app/serializers/import/fogbugz_provider_repo_entity.rb'
     - 'app/serializers/issuable_sidebar_basic_entity.rb'
@@ -55,6 +54,7 @@ Style/SymbolProc:
     - 'app/serializers/linked_project_issue_entity.rb'
     - 'app/serializers/member_entity.rb'
     - 'app/serializers/member_user_entity.rb'
+    - 'app/serializers/merge_request_poll_widget_entity.rb'
     - 'app/serializers/merge_request_widget_entity.rb'
     - 'app/serializers/project_entity.rb'
     - 'app/serializers/project_mirror_entity.rb'
@@ -69,7 +69,6 @@ Style/SymbolProc:
     - 'app/services/ci/update_build_state_service.rb'
     - 'app/services/clusters/agents/delete_expired_events_service.rb'
     - 'app/services/feature_flags/update_service.rb'
-    - 'app/services/google_cloud/enable_cloud_run_service.rb'
     - 'app/services/merge_requests/base_service.rb'
     - 'app/services/merge_requests/bulk_remove_attention_requested_service.rb'
     - 'app/services/merge_requests/reopen_service.rb'
@@ -81,6 +80,7 @@ Style/SymbolProc:
     - 'app/workers/bulk_imports/stuck_import_worker.rb'
     - 'app/workers/ci/build_trace_chunk_flush_worker.rb'
     - 'app/workers/gitlab/import/stuck_import_job.rb'
+    - 'app/workers/merge_requests/update_head_pipeline_worker.rb'
     - 'app/workers/namespaces/prune_aggregation_schedules_worker.rb'
     - 'app/workers/stuck_export_jobs_worker.rb'
     - 'app/workers/update_head_pipeline_for_merge_request_worker.rb'
@@ -119,6 +119,7 @@ Style/SymbolProc:
     - 'ee/lib/ee/api/entities/geo_node.rb'
     - 'ee/lib/ee/api/entities/merge_request_approval_state.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'
+    - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb'
     - 'ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb'
     - 'ee/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings.rb'
@@ -126,6 +127,7 @@ Style/SymbolProc:
     - 'ee/lib/gitlab/contribution_analytics/data_collector.rb'
     - 'ee/lib/gitlab/custom_file_templates.rb'
     - 'ee/lib/gitlab/geo/oauth/logout_state.rb'
+    - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
     - 'ee/spec/factories/issues.rb'
     - 'ee/spec/features/billings/extend_reactivate_trial_spec.rb'
     - 'ee/spec/features/billings/qrtly_reconciliation_alert_spec.rb'
@@ -133,13 +135,12 @@ Style/SymbolProc:
     - 'ee/spec/helpers/ee/registrations_helper_spec.rb'
     - 'ee/spec/lib/ee/gitlab/search_results_spec.rb'
     - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb'
-    - 'ee/spec/lib/gitlab/graphql/aggregations/issues/lazy_links_aggregate_spec.rb'
     - 'ee/spec/models/ee/iterations/cadence_spec.rb'
     - 'ee/spec/services/groups/participants_service_spec.rb'
     - 'ee/spec/support/helpers/subscription_portal_helpers.rb'
+    - 'ee/spec/support/shared_examples/lib/gitlab/graphql/issuables_lazy_links_aggregate_shared_examples.rb'
     - 'lib/api/api_guard.rb'
     - 'lib/api/entities/board.rb'
-    - 'lib/api/entities/environment.rb'
     - 'lib/api/entities/issuable_references.rb'
     - 'lib/api/entities/merge_request_approvals.rb'
     - 'lib/api/entities/package.rb'
@@ -148,7 +149,6 @@ Style/SymbolProc:
     - 'lib/api/go_proxy.rb'
     - 'lib/api/helpers/internal_helpers.rb'
     - 'lib/api/package_files.rb'
-    - 'lib/api/terraform/state.rb'
     - 'lib/atlassian/jira_connect/serializers/base_entity.rb'
     - 'lib/banzai/filter/inline_cluster_metrics_filter.rb'
     - 'lib/banzai/filter/inline_embeds_filter.rb'
@@ -157,6 +157,7 @@ Style/SymbolProc:
     - 'lib/container_registry/client.rb'
     - 'lib/container_registry/gitlab_api_client.rb'
     - 'lib/gitlab/analytics/cycle_analytics/stage_events.rb'
+    - 'lib/gitlab/auth/o_auth/auth_hash.rb'
     - 'lib/gitlab/background_migration/cleanup_orphaned_lfs_objects_projects.rb'
     - 'lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid.rb'
     - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb'
@@ -164,7 +165,6 @@ Style/SymbolProc:
     - 'lib/gitlab/cache/ci/project_pipeline_status.rb'
     - 'lib/gitlab/checks/changes_access.rb'
     - 'lib/gitlab/ci/pipeline/preloader.rb'
-    - 'lib/gitlab/ci/runner_upgrade_check.rb'
     - 'lib/gitlab/ci/trace.rb'
     - 'lib/gitlab/config/entry/node.rb'
     - 'lib/gitlab/database/async_indexes/migration_helpers.rb'
@@ -172,6 +172,7 @@ Style/SymbolProc:
     - 'lib/gitlab/database/migrations/background_migration_helpers.rb'
     - 'lib/gitlab/database/migrations/instrumentation.rb'
     - 'lib/gitlab/diff/file_collection/base.rb'
+    - 'lib/gitlab/diff/rendered/notebook/diff_file_helper.rb'
     - 'lib/gitlab/git/diff_stats_collection.rb'
     - 'lib/gitlab/gitaly_client/commit_service.rb'
     - 'lib/gitlab/gitaly_client/wiki_service.rb'
@@ -199,9 +200,9 @@ Style/SymbolProc:
     - 'qa/qa/resource/project_snippet.rb'
     - 'qa/qa/runtime/ip_address.rb'
     - 'qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb'
-    - 'qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb'
     - 'qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb'
     - 'qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb'
+    - 'qa/qa/specs/features/browser_ui/4_verify/ci_variable/custom_variable_spec.rb'
     - 'qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/12_geo/attachment_replication_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/12_geo/http_push_spec.rb'
@@ -219,6 +220,7 @@ Style/SymbolProc:
     - 'spec/controllers/concerns/product_analytics_tracking_spec.rb'
     - 'spec/controllers/concerns/redis_tracking_spec.rb'
     - 'spec/controllers/projects/merge_requests/conflicts_controller_spec.rb'
+    - 'spec/factories/application_settings.rb'
     - 'spec/factories/ci/builds.rb'
     - 'spec/factories/clusters/providers/aws.rb'
     - 'spec/factories/oauth_openid_requests.rb'
@@ -234,16 +236,19 @@ Style/SymbolProc:
     - 'spec/finders/license_template_finder_spec.rb'
     - 'spec/finders/packages/go/version_finder_spec.rb'
     - 'spec/graphql/mutations/releases/create_spec.rb'
+    - 'spec/graphql/types/work_items/widget_type_enum_spec.rb'
     - 'spec/helpers/instance_configuration_helper_spec.rb'
     - 'spec/helpers/learn_gitlab_helper_spec.rb'
     - 'spec/helpers/members_helper_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/gitlab/database/dynamic_model_helpers_spec.rb'
+    - 'spec/lib/gitlab/database/loose_foreign_keys_spec.rb'
     - 'spec/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers_spec.rb'
     - 'spec/lib/gitlab/git/commit_spec.rb'
     - 'spec/lib/gitlab/git/repository_spec.rb'
     - 'spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb'
     - 'spec/lib/gitlab/graphql/lazy_spec.rb'
+    - 'spec/lib/gitlab/graphql/markdown_field_spec.rb'
     - 'spec/lib/gitlab/instrumentation/redis_spec.rb'
     - 'spec/lib/gitlab/optimistic_locking_spec.rb'
     - 'spec/lib/gitlab/pagination/keyset/in_operator_optimization/query_builder_spec.rb'
@@ -252,12 +257,14 @@ Style/SymbolProc:
     - 'spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb'
     - 'spec/lib/omni_auth/strategies/jwt_spec.rb'
     - 'spec/models/member_spec.rb'
+    - 'spec/models/merge_request_diff_spec.rb'
     - 'spec/models/namespace/root_storage_statistics_spec.rb'
     - 'spec/models/operations/feature_flags/strategy_spec.rb'
     - 'spec/models/project_statistics_spec.rb'
     - 'spec/models/repository_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb'
+    - 'spec/requests/api/internal/mail_room_spec.rb'
     - 'spec/requests/api/snippet_repository_storage_moves_spec.rb'
     - 'spec/requests/api/tags_spec.rb'
     - 'spec/services/ci/pipelines/add_job_service_spec.rb'
@@ -266,12 +273,14 @@ Style/SymbolProc:
     - 'spec/services/notification_recipients/builder/default_spec.rb'
     - 'spec/services/packages/go/create_package_service_spec.rb'
     - 'spec/services/suggestions/apply_service_spec.rb'
+    - 'spec/spec_helper.rb'
     - 'spec/support/generate-seed-repo-rb'
     - 'spec/support/helpers/filter_spec_helper.rb'
     - 'spec/support/helpers/migrations_helpers.rb'
     - 'spec/support/shared_contexts/finders/users_finder_shared_contexts.rb'
     - 'spec/support/shared_examples/lib/gitlab/ci/ci_trace_shared_examples.rb'
     - 'spec/support/shared_examples/lib/gitlab/import_export/attributes_permitter_shared_examples.rb'
+    - 'spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb'
     - 'spec/support/shared_examples/models/label_note_shared_examples.rb'
     - 'spec/views/layouts/_published_experiments.html.haml_spec.rb'
     - 'spec/workers/snippets/schedule_bulk_repository_shard_moves_worker_spec.rb'