Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 172 deletions

diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml
index 5d103dae210..7eed5b16358 100644
--- a/.rubocop_todo/layout/hash_alignment.yml
+++ b/.rubocop_todo/layout/hash_alignment.yml
@@ -130,17 +130,6 @@ Layout/HashAlignment:
     - 'app/graphql/types/user_status_type.rb'
     - 'app/graphql/types/work_item_type.rb'
     - 'app/graphql/types/work_items/type_type.rb'
-    - 'app/helpers/avatars_helper.rb'
-    - 'app/helpers/blob_helper.rb'
-    - 'app/helpers/commits_helper.rb'
-    - 'app/helpers/environments_helper.rb'
-    - 'app/helpers/events_helper.rb'
-    - 'app/helpers/markup_helper.rb'
-    - 'app/helpers/preferences_helper.rb'
-    - 'app/helpers/projects_helper.rb'
-    - 'app/helpers/sorting_helper.rb'
-    - 'app/helpers/todos_helper.rb'
-    - 'app/helpers/wiki_helper.rb'
     - 'app/models/bulk_imports/configuration.rb'
     - 'app/models/ci/bridge.rb'
     - 'app/models/ci/build_trace_metadata.rb'
diff --git a/.rubocop_todo/layout/space_inside_block_braces.yml b/.rubocop_todo/layout/space_inside_block_braces.yml
index f6128bda7f0..4714e3e64bf 100644
--- a/.rubocop_todo/layout/space_inside_block_braces.yml
+++ b/.rubocop_todo/layout/space_inside_block_braces.yml
@@ -84,34 +84,6 @@ Layout/SpaceInsideBlockBraces:
     - 'ee/spec/helpers/ee/registrations_helper_spec.rb'
     - 'ee/spec/helpers/ee/trial_helper_spec.rb'
     - 'ee/spec/helpers/projects/on_demand_scans_helper_spec.rb'
-    - 'ee/spec/lib/analytics/group_activity_calculator_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/alert_management/payload/generic_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/drop_invalid_remediations_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/migrate_job_artifact_registry_to_ssf_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/ci/reports/security/reports_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/import_export/project/tree_restorer_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/usage_data_counters/issue_activity_unique_counter_spec.rb'
-    - 'ee/spec/lib/ee/sidebars/groups/menus/issues_menu_spec.rb'
-    - 'ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb'
-    - 'ee/spec/lib/ee/sidebars/projects/menus/ci_cd_menu_spec.rb'
-    - 'ee/spec/lib/ee/sidebars/projects/menus/issues_menu_spec.rb'
-    - 'ee/spec/lib/ee/sidebars/projects/menus/repository_menu_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/gma_membership_enforcer_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/parsers/security/container_scanning_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/reports/license_scanning/dependency_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/reports/security/finding_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/git_ssh_proxy_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_renamed_event_spec.rb'
-    - 'ee/spec/lib/gitlab/git_access_spec.rb'
-    - 'ee/spec/lib/gitlab/graphql/loaders/bulk_epic_aggregate_loader_spec.rb'
-    - 'ee/spec/lib/gitlab/ip_address_state_spec.rb'
-    - 'ee/spec/lib/gitlab/search_context/builder_spec.rb'
-    - 'ee/spec/lib/gitlab/status_page/filter/image_filter_spec.rb'
-    - 'ee/spec/lib/gitlab/usage/metrics/instrumentations/approval_project_rules_with_user_metric_spec.rb'
     - 'ee/spec/mailers/credentials_inventory_mailer_spec.rb'
     - 'ee/spec/migrations/geo/migrate_job_artifact_registry_spec.rb'
     - 'ee/spec/models/analytics/devops_adoption/enabled_namespace_spec.rb'
@@ -337,139 +309,6 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/helpers/wiki_page_version_helper_spec.rb'
     - 'spec/initializers/carrierwave_patch_spec.rb'
     - 'spec/initializers/trusted_proxies_spec.rb'
-    - 'spec/lib/api/entities/ci/job_request/image_spec.rb'
-    - 'spec/lib/api/entities/ci/job_request/port_spec.rb'
-    - 'spec/lib/api/helpers_spec.rb'
-    - 'spec/lib/banzai/cross_project_reference_spec.rb'
-    - 'spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb'
-    - 'spec/lib/banzai/filter/commit_trailers_filter_spec.rb'
-    - 'spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb'
-    - 'spec/lib/banzai/renderer_spec.rb'
-    - 'spec/lib/bitbucket_server/connection_spec.rb'
-    - 'spec/lib/bulk_imports/common/pipelines/lfs_objects_pipeline_spec.rb'
-    - 'spec/lib/bulk_imports/common/pipelines/uploads_pipeline_spec.rb'
-    - 'spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb'
-    - 'spec/lib/feature/definition_spec.rb'
-    - 'spec/lib/feature_spec.rb'
-    - 'spec/lib/gitlab/application_context_spec.rb'
-    - 'spec/lib/gitlab/asciidoc_spec.rb'
-    - 'spec/lib/gitlab/audit/ci_runner_token_author_spec.rb'
-    - 'spec/lib/gitlab/background_migration/copy_ci_builds_columns_to_security_scans_spec.rb'
-    - 'spec/lib/gitlab/batch_pop_queueing_spec.rb'
-    - 'spec/lib/gitlab/chat_name_token_spec.rb'
-    - 'spec/lib/gitlab/ci/ansi2html_spec.rb'
-    - 'spec/lib/gitlab/ci/ansi2json_spec.rb'
-    - 'spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb'
-    - 'spec/lib/gitlab/ci/config/entry/processable_spec.rb'
-    - 'spec/lib/gitlab/ci/config/entry/release_spec.rb'
-    - 'spec/lib/gitlab/ci/config/entry/tags_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/base_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/local_spec.rb'
-    - 'spec/lib/gitlab/ci/config/external/file/remote_spec.rb'
-    - 'spec/lib/gitlab/ci/config/normalizer_spec.rb'
-    - 'spec/lib/gitlab/ci/cron_parser_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/chain/create_deployments_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/chain/seed_block_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/chain/seed_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/chain/validate/external_spec.rb'
-    - 'spec/lib/gitlab/ci/pipeline/quota/deployments_spec.rb'
-    - 'spec/lib/gitlab/ci/reports/security/reports_spec.rb'
-    - 'spec/lib/gitlab/ci/reports/security/vulnerability_reports_comparer_spec.rb'
-    - 'spec/lib/gitlab/ci/reports/test_suite_spec.rb'
-    - 'spec/lib/gitlab/ci/status/build/canceled_spec.rb'
-    - 'spec/lib/gitlab/ci/status/build/created_spec.rb'
-    - 'spec/lib/gitlab/ci/status/build/manual_spec.rb'
-    - 'spec/lib/gitlab/ci/status/build/pending_spec.rb'
-    - 'spec/lib/gitlab/ci/status/build/skipped_spec.rb'
-    - 'spec/lib/gitlab/ci/status/processable/waiting_for_resource_spec.rb'
-    - 'spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb'
-    - 'spec/lib/gitlab/ci/trace/remote_checksum_spec.rb'
-    - 'spec/lib/gitlab/ci/yaml_processor_spec.rb'
-    - 'spec/lib/gitlab/composer/cache_spec.rb'
-    - 'spec/lib/gitlab/data_builder/build_spec.rb'
-    - 'spec/lib/gitlab/data_builder/pipeline_spec.rb'
-    - 'spec/lib/gitlab/database/background_migration/batched_migration_spec.rb'
-    - 'spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb'
-    - 'spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb'
-    - 'spec/lib/gitlab/database/migration_helpers/v2_spec.rb'
-    - 'spec/lib/gitlab/database/migration_helpers_spec.rb'
-    - 'spec/lib/gitlab/database/migrations/lock_retry_mixin_spec.rb'
-    - 'spec/lib/gitlab/database/migrations/runner_spec.rb'
-    - 'spec/lib/gitlab/database/partitioning_spec.rb'
-    - 'spec/lib/gitlab/database/reindexing/grafana_notifier_spec.rb'
-    - 'spec/lib/gitlab/database/with_lock_retries_outside_transaction_spec.rb'
-    - 'spec/lib/gitlab/database/with_lock_retries_spec.rb'
-    - 'spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb'
-    - 'spec/lib/gitlab/database_spec.rb'
-    - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
-    - 'spec/lib/gitlab/email/handler/service_desk_handler_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/admin_verify_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/create_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/experience_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/team_short_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/team_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/trial_short_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/trial_spec.rb'
-    - 'spec/lib/gitlab/email/message/in_product_marketing/verify_spec.rb'
-    - 'spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb'
-    - 'spec/lib/gitlab/exclusive_lease_helpers_spec.rb'
-    - 'spec/lib/gitlab/file_markdown_link_builder_spec.rb'
-    - 'spec/lib/gitlab/git/blob_spec.rb'
-    - 'spec/lib/gitlab/git/commit_spec.rb'
-    - 'spec/lib/gitlab/git/diff_collection_spec.rb'
-    - 'spec/lib/gitlab/git/raw_diff_change_spec.rb'
-    - 'spec/lib/gitlab/git/repository_spec.rb'
-    - 'spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb'
-    - 'spec/lib/gitlab/gitaly_client/commit_service_spec.rb'
-    - 'spec/lib/gitlab/github_import/client_spec.rb'
-    - 'spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb'
-    - 'spec/lib/gitlab/gpg_spec.rb'
-    - 'spec/lib/gitlab/graphql/markdown_field_spec.rb'
-    - 'spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb'
-    - 'spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb'
-    - 'spec/lib/gitlab/graphs/commits_spec.rb'
-    - 'spec/lib/gitlab/highlight_spec.rb'
-    - 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb'
-    - 'spec/lib/gitlab/import_export/json/ndjson_writer_spec.rb'
-    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
-    - 'spec/lib/gitlab/import_export/version_checker_spec.rb'
-    - 'spec/lib/gitlab/jira/dvcs_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/rollout_status_spec.rb'
-    - 'spec/lib/gitlab/metrics/background_transaction_spec.rb'
-    - 'spec/lib/gitlab/metrics/web_transaction_spec.rb'
-    - 'spec/lib/gitlab/middleware/compressed_json_spec.rb'
-    - 'spec/lib/gitlab/middleware/sidekiq_web_static_spec.rb'
-    - 'spec/lib/gitlab/otp_key_rotator_spec.rb'
-    - 'spec/lib/gitlab/pagination/keyset_spec.rb'
-    - 'spec/lib/gitlab/phabricator_import/conduit/response_spec.rb'
-    - 'spec/lib/gitlab/prometheus_client_spec.rb'
-    - 'spec/lib/gitlab/quick_actions/command_definition_spec.rb'
-    - 'spec/lib/gitlab/quick_actions/extractor_spec.rb'
-    - 'spec/lib/gitlab/rack_attack/instrumented_cache_store_spec.rb'
-    - 'spec/lib/gitlab/rack_attack/user_allowlist_spec.rb'
-    - 'spec/lib/gitlab/redis/hll_spec.rb'
-    - 'spec/lib/gitlab/reference_counter_spec.rb'
-    - 'spec/lib/gitlab/regex_spec.rb'
-    - 'spec/lib/gitlab/search/abuse_detection_spec.rb'
-    - 'spec/lib/gitlab/search_context/builder_spec.rb'
-    - 'spec/lib/gitlab/session_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_daemon/memory_killer_spec.rb'
-    - 'spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb'
-    - 'spec/lib/gitlab/spamcheck/client_spec.rb'
-    - 'spec/lib/gitlab/suggestions/file_suggestion_spec.rb'
-    - 'spec/lib/gitlab/usage/metrics/name_suggestion_spec.rb'
-    - 'spec/lib/gitlab/usage/metrics/names_suggestions/generator_spec.rb'
-    - 'spec/lib/gitlab/utils/sanitize_node_link_spec.rb'
-    - 'spec/lib/gitlab/utils/usage_data_spec.rb'
-    - 'spec/lib/gitlab/utils_spec.rb'
-    - 'spec/lib/gitlab/verify/uploads_spec.rb'
-    - 'spec/lib/gitlab/version_info_spec.rb'
-    - 'spec/lib/json_web_token/rsa_token_spec.rb'
-    - 'spec/lib/marginalia_spec.rb'
-    - 'spec/lib/mattermost/session_spec.rb'
-    - 'spec/lib/microsoft_teams/notifier_spec.rb'
-    - 'spec/lib/sidebars/groups/menus/group_information_menu_spec.rb'
-    - 'spec/lib/sidebars/menu_spec.rb'
     - 'spec/mailers/emails/service_desk_spec.rb'
     - 'spec/migrations/20210812013042_remove_duplicate_project_authorizations_spec.rb'
     - 'spec/migrations/20210910194952_update_report_type_for_existing_approval_project_rules_spec.rb'