Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 100 insertions, 66 deletions

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index 477d9adec40..9b20af55520 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -10,57 +10,48 @@
 # - guidelines for use found in
 #   https://docs.gitlab.com/ee/development/contributing/style_guides.html#resolving-rubocop-exceptions.
 
+# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/322903
+Graphql/Descriptions:
+  Exclude:
+    - 'app/graphql/types/access_level_enum.rb'
+    - 'app/graphql/types/base_enum.rb'
+    - 'app/graphql/types/ci/pipeline_config_source_enum.rb'
+    - 'app/graphql/types/ci/pipeline_status_enum.rb'
+    - 'app/graphql/types/container_expiration_policy_cadence_enum.rb'
+    - 'app/graphql/types/container_expiration_policy_keep_enum.rb'
+    - 'app/graphql/types/container_expiration_policy_older_than_enum.rb'
+    - 'app/graphql/types/notes/position_type_enum.rb'
+    - 'app/graphql/types/packages/package_type_enum.rb'
+    - 'app/graphql/types/snippets/blob_action_enum.rb'
+    - 'app/graphql/types/snippets/type_enum.rb'
+    - 'app/graphql/types/snippets/visibility_scopes_enum.rb'
+    - 'app/graphql/types/todo_action_enum.rb'
+    - 'app/graphql/types/tree/type_enum.rb'
+    - 'ee/app/graphql/ee/types/list_limit_metric_enum.rb'
+    - 'ee/app/graphql/types/alert_management/payload_alert_field_name_enum.rb'
+    - 'ee/app/graphql/types/epic_state_enum.rb'
+    - 'ee/app/graphql/types/health_status_enum.rb'
+    - 'ee/app/graphql/types/iteration_state_enum.rb'
+    - 'ee/app/graphql/types/requirements_management/requirement_state_enum.rb'
+    - 'ee/app/graphql/types/requirements_management/test_report_state_enum.rb'
+    - 'ee/app/graphql/types/security_scanner_type_enum.rb'
+    - 'ee/app/graphql/types/vulnerability/issue_link_type_enum.rb'
+    - 'ee/app/graphql/types/vulnerability_grade_enum.rb'
+    - 'ee/app/graphql/types/vulnerability_report_type_enum.rb'
+    - 'ee/app/graphql/types/vulnerability_severity_enum.rb'
+    - 'ee/app/graphql/types/vulnerability_state_enum.rb'
+
+# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606
 FactoryBot/InlineAssociation:
   Exclude:
-    - 'ee/spec/factories/analytics/cycle_analytics/group_stages.rb'
-    - 'ee/spec/factories/geo/event_log.rb'
-    - 'ee/spec/factories/merge_request_blocks.rb'
-    - 'ee/spec/factories/vulnerabilities/feedback.rb'
     - 'spec/factories/atlassian_identities.rb'
     - 'spec/factories/events.rb'
     - 'spec/factories/git_wiki_commit_details.rb'
     - 'spec/factories/gitaly/commit.rb'
-    - 'spec/factories/go_module_commits.rb'
-    - 'spec/factories/go_module_versions.rb'
-    - 'spec/factories/go_modules.rb'
     - 'spec/factories/group_group_links.rb'
     - 'spec/factories/import_export_uploads.rb'
-    - 'spec/factories/uploads.rb'
-    - 'spec/factories/wiki_pages.rb'
-
-InternalAffairs/DeprecateCopHelper: # issue to resolve: https://gitlab.com/gitlab-org/gitlab/-/issues/276734
-  Exclude:
-    - 'spec/rubocop/cop/migration/safer_boolean_column_spec.rb'
-    - 'spec/rubocop/cop/migration/remove_index_spec.rb'
-    - 'spec/rubocop/cop/migration/add_index_spec.rb'
-    - 'spec/rubocop/cop/migration/drop_table_spec.rb'
-    - 'spec/rubocop/cop/migration/hash_index_spec.rb'
-    - 'spec/rubocop/cop/migration/datetime_spec.rb'
-    - 'spec/rubocop/cop/migration/add_column_with_default_spec.rb'
-    - 'spec/rubocop/cop/migration/prevent_strings_spec.rb'
-    - 'spec/rubocop/cop/migration/add_timestamps_spec.rb'
-    - 'spec/rubocop/cop/migration/add_concurrent_index_spec.rb'
-    - 'spec/rubocop/cop/migration/update_column_in_batches_spec.rb'
-    - 'spec/rubocop/cop/migration/complex_indexes_require_name_spec.rb'
-    - 'spec/rubocop/cop/migration/refer_to_index_by_name_spec.rb'
-    - 'spec/rubocop/cop/migration/schedule_async_spec.rb'
-    - 'spec/rubocop/cop/migration/timestamps_spec.rb'
-    - 'spec/rubocop/cop/migration/remove_concurrent_index_spec.rb'
-    - 'spec/rubocop/cop/migration/add_columns_to_wide_tables_spec.rb'
-    - 'spec/rubocop/cop/migration/with_lock_retries_disallowed_method_spec.rb'
-    - 'spec/rubocop/cop/migration/add_reference_spec.rb'
-    - 'spec/rubocop/cop/migration/remove_column_spec.rb'
-    - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb'
-    - 'spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb'
-    - 'spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb'
-    - 'spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb'
-    - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'
-    - 'spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb'
-    - 'spec/rubocop/cop/put_group_routes_under_scope_spec.rb'
-    - 'spec/rubocop/cop/sidekiq_options_queue_spec.rb'
-    - 'spec/rubocop/cop/ignored_columns_spec.rb'
-    - 'spec/rubocop/cop/prefer_class_methods_over_module_spec.rb'
 
+# WIP: See https://gitlab.com/gitlab-org/gitlab/-/issues/220040
 Rails/SaveBang:
   Exclude:
     - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'
@@ -516,8 +507,8 @@ Rails/TimeZone:
     - 'lib/json_web_token/token.rb'
     - 'lib/object_storage/direct_upload.rb'
     - 'lib/quality/seeders/issues.rb'
-    - 'lib/rspec_flaky/flaky_example.rb'
-    - 'lib/rspec_flaky/report.rb'
+    - 'tooling/rspec_flaky/flaky_example.rb'
+    - 'tooling/rspec_flaky/report.rb'
     - 'lib/tasks/gitlab/assets.rake'
     - 'lib/tasks/gitlab/backup.rake'
     - 'lib/tasks/gitlab/cleanup.rake'
@@ -583,9 +574,9 @@ Rails/TimeZone:
     - 'spec/lib/gitlab/x509/signature_spec.rb'
     - 'spec/lib/grafana/time_window_spec.rb'
     - 'spec/lib/json_web_token/hmac_token_spec.rb'
-    - 'spec/lib/rspec_flaky/flaky_example_spec.rb'
-    - 'spec/lib/rspec_flaky/listener_spec.rb'
-    - 'spec/lib/rspec_flaky/report_spec.rb'
+    - 'spec/tooling/rspec_flaky/flaky_example_spec.rb'
+    - 'spec/tooling/rspec_flaky/listener_spec.rb'
+    - 'spec/tooling/rspec_flaky/report_spec.rb'
 
 RSpec/TimecopFreeze:
   Exclude:
@@ -658,8 +649,8 @@ RSpec/TimecopFreeze:
     - 'spec/lib/gitlab/puma_logging/json_formatter_spec.rb'
     - 'spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb'
     - 'spec/lib/json_web_token/hmac_token_spec.rb'
-    - 'spec/lib/rspec_flaky/flaky_example_spec.rb'
-    - 'spec/lib/rspec_flaky/listener_spec.rb'
+    - 'spec/tooling/rspec_flaky/flaky_example_spec.rb'
+    - 'spec/tooling/rspec_flaky/listener_spec.rb'
     - 'spec/models/active_session_spec.rb'
     - 'spec/serializers/entity_date_helper_spec.rb'
     - 'spec/support/cycle_analytics_helpers/test_generation.rb'
@@ -812,7 +803,7 @@ RSpec/AnyInstanceOf:
     - 'ee/spec/services/slash_commands/global_slack_handler_spec.rb'
     - 'ee/spec/support/helpers/ee/stub_configuration.rb'
     - 'ee/spec/support/shared_examples/controllers/analytics/cycle_analytics/shared_stage_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/features/gold_trial_callout_shared_examples.rb'
+    - 'ee/spec/support/shared_examples/features/ultimate_trial_callout_shared_examples.rb'
     - 'ee/spec/support/shared_examples/lib/gitlab/geo/geo_logs_event_source_info_shared_examples.rb'
     - 'ee/spec/support/shared_examples/models/member_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/base_sync_service_shared_examples.rb'
@@ -1207,22 +1198,9 @@ RSpec/AnyInstanceOf:
     - 'spec/workers/wait_for_cluster_creation_worker_spec.rb'
     - 'ee/spec/workers/security/auto_fix_worker_spec.rb'
 
+# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/321982
 Gitlab/NamespacedClass:
   Exclude:
-    - 'config/**/*.rb'
-    - 'db/**/*.rb'
-    - 'ee/bin/**/*'
-    - 'ee/db/**/*.rb'
-    - 'ee/elastic/**/*.rb'
-    - 'scripts/**/*'
-    - 'spec/migrations/**/*.rb'
-    # The list above represents the permanent exclusions for this rule
-    # due to the fact these files are related to infrastructure code.
-    # This list should eventually be moved to .rubocop.yml after all TODOs
-    # are addressed.
-    #
-    # The list below represents the classes that require
-    # a namespace as they make the domain related code.
     - 'app/channels/issues_channel.rb'
     - 'app/controllers/abuse_reports_controller.rb'
     - 'app/controllers/acme_challenges_controller.rb'
@@ -2021,7 +1999,6 @@ Gitlab/NamespacedClass:
     - 'app/validators/untrusted_regexp_validator.rb'
     - 'app/validators/nested_attributes_duplicates_validator.rb'
     - 'app/validators/x509_certificate_credentials_validator.rb'
-    - 'app/validators/zoom_url_validator.rb'
     - 'app/workers/admin_email_worker.rb'
     - 'app/workers/approve_blocked_pending_approval_users_worker.rb'
     - 'app/workers/archive_trace_worker.rb'
@@ -2296,6 +2273,7 @@ Gitlab/NamespacedClass:
     - 'ee/app/policies/instance_security_dashboard_policy.rb'
     - 'ee/app/policies/issuable_metric_image_policy.rb'
     - 'ee/app/policies/iteration_policy.rb'
+    - 'ee/app/policies/push_rule_policy.rb'
     - 'ee/app/policies/saml_provider_policy.rb'
     - 'ee/app/policies/timelog_policy.rb'
     - 'ee/app/policies/vulnerability_policy.rb'
@@ -2372,7 +2350,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/serializers/vulnerability_note_serializer.rb'
     - 'ee/app/serializers/vulnerability_serializer.rb'
     - 'ee/app/services/clear_namespace_shared_runners_minutes_service.rb'
-    - 'ee/app/services/fetch_subscription_plans_service.rb'
     - 'ee/app/services/ldap_group_reset_service.rb'
     - 'ee/app/services/start_pull_mirroring_service.rb'
     - 'ee/app/services/timebox_report_service.rb'
@@ -2473,3 +2450,60 @@ Gitlab/NamespacedClass:
     - 'spec/support/sidekiq_middleware.rb'
     - 'spec/tasks/gitlab/task_helpers_spec.rb'
     - 'spec/uploaders/object_storage_spec.rb'
+
+# WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/322739
+Style/HashTransformation:
+  Exclude:
+    - 'app/controllers/projects/branches_controller.rb'
+    - 'app/finders/ci/commit_statuses_finder.rb'
+    - 'app/helpers/learn_gitlab_helper.rb'
+    - 'app/models/ci/build_trace_chunk.rb'
+    - 'app/models/concerns/cache_markdown_field.rb'
+    - 'app/models/gpg_key.rb'
+    - 'app/presenters/packages/npm/package_presenter.rb'
+    - 'app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb'
+    - 'app/services/ci/retry_build_service.rb'
+    - 'app/services/packages/nuget/create_dependency_service.rb'
+    - 'ee/app/models/ee/ci/build.rb'
+    - 'ee/app/models/productivity_analytics.rb'
+    - 'ee/app/models/sca/license_compliance.rb'
+    - 'ee/app/services/security/store_report_service.rb'
+    - 'ee/lib/ee/gitlab/auth/ldap/sync/group.rb'
+    - 'ee/lib/ee/gitlab/usage_data.rb'
+    - 'ee/lib/gitlab/custom_file_templates.rb'
+    - 'ee/spec/elastic_integration/global_search_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
+    - 'lib/api/helpers/packages/conan/api_helpers.rb'
+    - 'lib/api/projects.rb'
+    - 'lib/atlassian/jira_connect/client.rb'
+    - 'lib/banzai/filter/repository_link_filter.rb'
+    - 'lib/gitlab/ci/config/entry/product/variables.rb'
+    - 'lib/gitlab/ci/config/entry/variables.rb'
+    - 'lib/gitlab/ci/variables/collection.rb'
+    - 'lib/gitlab/ci/variables/helpers.rb'
+    - 'lib/gitlab/git/commit.rb'
+    - 'lib/gitlab/import_sources.rb'
+    - 'lib/gitlab/language_detection.rb'
+    - 'lib/gitlab/metrics/samplers/database_sampler.rb'
+    - 'lib/gitlab/metrics/subscribers/active_record.rb'
+    - 'lib/gitlab/phabricator_import/project_creator.rb'
+    - 'lib/gitlab/prometheus_client.rb'
+    - 'lib/gitlab/repository_hash_cache.rb'
+    - 'lib/gitlab/static_site_editor/config/file_config.rb'
+    - 'lib/gitlab/template/base_template.rb'
+    - 'lib/gitlab/usage_data_counters/base_counter.rb'
+    - 'lib/gitlab/usage_data_counters/note_counter.rb'
+    - 'spec/lib/atlassian/jira_connect/serializers/pull_request_entity_spec.rb'
+    - 'spec/lib/gitlab/ci/status/composite_spec.rb'
+    - 'spec/lib/gitlab/conflict/file_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
+    - 'spec/models/concerns/featurable_spec.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/models/packages/dependency_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb'
+    - 'spec/requests/api/graphql/project/alert_management/alert/todos_spec.rb'
+    - 'spec/requests/api/projects_spec.rb'
+    - 'spec/support/helpers/graphql_helpers.rb'
+    - 'spec/support/import_export/project_tree_expectations.rb'
+    - 'spec/support/shared_contexts/services/projects/container_repository/delete_tags_service_shared_context.rb'