Add latest changes from gitlab-org/gitlab@master

10 files changed, 0 insertions, 46 deletions

diff --git a/.rubocop_todo/lint/ambiguous_operator_precedence.yml b/.rubocop_todo/lint/ambiguous_operator_precedence.yml
index 8b6ef5db135..6b4ba8ff8d7 100644
--- a/.rubocop_todo/lint/ambiguous_operator_precedence.yml
+++ b/.rubocop_todo/lint/ambiguous_operator_precedence.yml
@@ -30,7 +30,6 @@ Lint/AmbiguousOperatorPrecedence:
     - 'app/services/issuable_links/create_service.rb'
     - 'app/services/issues/relative_position_rebalancing_service.rb'
     - 'app/services/jira/requests/base.rb'
-    - 'app/services/projects/blame_service.rb'
     - 'config/initializers/1_settings.rb'
     - 'config/initializers/carrierwave_patch.rb'
     - 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb'
@@ -142,7 +141,6 @@ Lint/AmbiguousOperatorPrecedence:
     - 'spec/services/ci/pipeline_schedules/calculate_next_run_service_spec.rb'
     - 'spec/services/issues/relative_position_rebalancing_service_spec.rb'
     - 'spec/services/web_hook_service_spec.rb'
-    - 'spec/support/cycle_analytics_helpers/test_generation.rb'
     - 'spec/support/helpers/dependency_proxy_helpers.rb'
     - 'spec/support/models/ci/partitioning_testing/cascade_check.rb'
     - 'spec/support/shared_examples/features/sidebar_shared_examples.rb'
diff --git a/.rubocop_todo/lint/ambiguous_regexp_literal.yml b/.rubocop_todo/lint/ambiguous_regexp_literal.yml
index d0160d620d5..6f2b8f03f8a 100644
--- a/.rubocop_todo/lint/ambiguous_regexp_literal.yml
+++ b/.rubocop_todo/lint/ambiguous_regexp_literal.yml
@@ -62,8 +62,6 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/lib/gitlab/database/partitioning_spec.rb'
     - 'spec/lib/gitlab/database/query_analyzers/prevent_cross_database_modification_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/with_feature_flag_actors_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v2/base_command_spec.rb'
-    - 'spec/lib/gitlab/kubernetes/helm/v3/base_command_spec.rb'
     - 'spec/lib/gitlab/pagination/keyset/in_operator_optimization/array_scope_columns_spec.rb'
     - 'spec/lib/gitlab/pagination/keyset/in_operator_optimization/query_builder_spec.rb'
     - 'spec/lib/gitlab/pagination/keyset/iterator_spec.rb'
diff --git a/.rubocop_todo/lint/duplicate_branch.yml b/.rubocop_todo/lint/duplicate_branch.yml
index 89d1ff7e2aa..6a171415cbc 100644
--- a/.rubocop_todo/lint/duplicate_branch.yml
+++ b/.rubocop_todo/lint/duplicate_branch.yml
@@ -33,4 +33,3 @@ Lint/DuplicateBranch:
     - 'lib/sidebars/groups/menus/settings_menu.rb'
     - 'qa/qa/resource/pipeline.rb'
     - 'scripts/rubocop-parse'
-    - 'spec/support/shared_contexts/features/integrations/integrations_shared_context.rb'
diff --git a/.rubocop_todo/lint/duplicate_regexp_character_class_element.yml b/.rubocop_todo/lint/duplicate_regexp_character_class_element.yml
index 813a27455a8..c0d46ba9e95 100644
--- a/.rubocop_todo/lint/duplicate_regexp_character_class_element.yml
+++ b/.rubocop_todo/lint/duplicate_regexp_character_class_element.yml
@@ -4,4 +4,3 @@ Lint/DuplicateRegexpCharacterClassElement:
   Details: grace period
   Exclude:
     - 'lib/gitlab/path_regex.rb'
-    - 'spec/support/shared_contexts/features/integrations/integrations_shared_context.rb'
diff --git a/.rubocop_todo/lint/empty_block.yml b/.rubocop_todo/lint/empty_block.yml
index 43289b4bfbd..4cd66fdc30f 100644
--- a/.rubocop_todo/lint/empty_block.yml
+++ b/.rubocop_todo/lint/empty_block.yml
@@ -137,7 +137,6 @@ Lint/EmptyBlock:
     - 'spec/lib/gitlab/patch/prependable_spec.rb'
     - 'spec/lib/gitlab/profiler_spec.rb'
     - 'spec/lib/gitlab/quick_actions/extractor_spec.rb'
-    - 'spec/lib/gitlab/rack_attack/instrumented_cache_store_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'
diff --git a/.rubocop_todo/lint/missing_cop_enable_directive.yml b/.rubocop_todo/lint/missing_cop_enable_directive.yml
index 8346468e4fc..5a5d4d752d2 100644
--- a/.rubocop_todo/lint/missing_cop_enable_directive.yml
+++ b/.rubocop_todo/lint/missing_cop_enable_directive.yml
@@ -67,7 +67,6 @@ Lint/MissingCopEnableDirective:
     - 'danger/feature_flag/Dangerfile'
     - 'danger/pajamas/Dangerfile'
     - 'danger/z_metadata/Dangerfile'
-    - 'db/migrate/20211013014228_add_content_validation_endpoint_to_application_settings.rb'
     - 'db/migrate/20220531024905_add_operations_access_levels_to_project_feature.rb'
     - 'ee/app/controllers/ee/admin/dashboard_controller.rb'
     - 'ee/app/controllers/ee/admin/groups_controller.rb'
@@ -137,7 +136,6 @@ Lint/MissingCopEnableDirective:
     - 'ee/app/services/ee/ci/queue/build_queue_service.rb'
     - 'ee/app/workers/ci/runners/stale_group_runners_prune_cron_worker.rb'
     - 'ee/app/workers/groups/export_memberships_worker.rb'
-    - 'ee/app/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker.rb'
     - 'ee/lib/api/ldap_group_links.rb'
     - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
@@ -151,27 +149,16 @@ Lint/MissingCopEnableDirective:
     - 'lib/gitlab/background_migration/backfill_imported_issue_search_data.rb'
     - 'lib/gitlab/background_migration/backfill_issue_search_data.rb'
     - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb'
-    - 'lib/gitlab/background_migration/backfill_namespace_traversal_ids_children.rb'
-    - 'lib/gitlab/background_migration/backfill_namespace_traversal_ids_roots.rb'
     - 'lib/gitlab/background_migration/delete_invalid_epic_issues.rb'
-    - 'lib/gitlab/background_migration/drop_invalid_vulnerabilities.rb'
-    - 'lib/gitlab/background_migration/fix_incorrect_max_seats_used.rb'
     - 'lib/gitlab/background_migration/mailers/unconfirm_mailer.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb'
     - 'lib/gitlab/background_migration/migrate_job_artifact_registry_to_ssf.rb'
-    - 'lib/gitlab/background_migration/migrate_u2f_webauthn.rb'
     - 'lib/gitlab/background_migration/populate_latest_pipeline_ids.rb'
     - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
-    - 'lib/gitlab/background_migration/populate_test_reports_issue_id.rb'
-    - 'lib/gitlab/background_migration/populate_uuids_for_security_findings.rb'
     - 'lib/gitlab/background_migration/purge_stale_security_scans.rb'
-    - 'lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid.rb'
-    - 'lib/gitlab/background_migration/recalculate_vulnerability_finding_signatures_for_findings.rb'
-    - 'lib/gitlab/background_migration/remove_duplicate_vulnerabilities_findings.rb'
     - 'lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb'
-    - 'lib/gitlab/background_migration/update_users_where_two_factor_auth_required_from_group.rb'
     - 'lib/gitlab/buffered_io.rb'
     - 'lib/gitlab/ci/reports/test_suite_summary.rb'
     - 'lib/gitlab/data_builder/push.rb'
@@ -195,6 +182,5 @@ Lint/MissingCopEnableDirective:
     - 'spec/benchmarks/banzai_benchmark.rb'
     - 'spec/lib/gitlab/sidekiq_middleware/size_limiter/server_spec.rb'
     - 'spec/support/capybara.rb'
-    - 'spec/support/cycle_analytics_helpers/test_generation.rb'
     - 'spec/support/google_api/cloud_platform_helpers.rb'
     - 'tooling/danger/product_intelligence.rb'
diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
index 1ae433adc05..236e5c6a35a 100644
--- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml
+++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
@@ -77,13 +77,9 @@ Lint/RedundantCopDisableDirective:
     - 'config/initializers/wikicloth_redos_patch.rb'
     - 'config/initializers/wikicloth_ruby_3_patch.rb'
     - 'config/routes/api.rb'
-    - 'db/migrate/20210917134321_remove_temporary_index_for_project_topics_on_taggings.rb'
-    - 'db/migrate/20211013014228_add_content_validation_endpoint_to_application_settings.rb'
     - 'db/migrate/20220316022505_create_namespace_details.rb'
     - 'db/migrate/20220421141342_add_allowed_plans_to_ci_runners.rb'
     - 'db/migrate/20220531024905_add_operations_access_levels_to_project_feature.rb'
-    - 'db/post_migrate/20210906130643_drop_temporary_columns_and_triggers_for_taggings.rb'
-    - 'db/post_migrate/20211028100303_tmp_index_for_delete_issue_merge_request_taggings_records.rb'
     - 'db/post_migrate/20220328100456_schedule20220328_reset_duplicate_ci_runners_token_encrypted_values_on_projects.rb'
     - 'db/post_migrate/20220328100457_schedule20220328_reset_duplicate_ci_runners_token_values_on_projects.rb'
     - 'db/post_migrate/20220720090354_remove_pending_builds_covering_index_from_ci_builds.rb'
@@ -151,7 +147,6 @@ Lint/RedundantCopDisableDirective:
     - 'ee/lib/gitlab/spdx/license.rb'
     - 'ee/lib/gitlab/status_page/storage/object.rb'
     - 'ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb'
-    - 'ee/spec/controllers/concerns/registrations/verification_spec.rb'
     - 'ee/spec/controllers/concerns/routable_actions_spec.rb'
     - 'ee/spec/elastic/migrate/20221026082700_backfill_users_spec.rb'
     - 'ee/spec/features/boards/user_visits_board_spec.rb'
@@ -188,12 +183,9 @@ Lint/RedundantCopDisableDirective:
     - 'lib/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb'
     - 'lib/gitlab/background_migration/backfill_project_statistics_storage_size_without_uploads_size.rb'
     - 'lib/gitlab/background_migration/batching_strategies/loose_index_scan_batching_strategy.rb'
-    - 'lib/gitlab/background_migration/drop_invalid_vulnerabilities.rb'
     - 'lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics.rb'
     - 'lib/gitlab/background_migration/migrate_personal_namespace_project_maintainer_to_owner.rb'
     - 'lib/gitlab/background_migration/re_expire_o_auth_tokens.rb'
-    - 'lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid.rb'
-    - 'lib/gitlab/background_migration/remove_duplicate_vulnerabilities_findings.rb'
     - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb'
     - 'lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb'
     - 'lib/gitlab/bitbucket_import/importer.rb'
@@ -274,7 +266,6 @@ Lint/RedundantCopDisableDirective:
     - 'spec/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent_spec.rb'
     - 'spec/lib/gitlab/background_migration/batching_strategies/backfill_project_statistics_with_container_registry_size_batching_strategy_spec.rb'
     - 'spec/lib/gitlab/background_migration/batching_strategies/remove_backfilled_job_artifacts_expire_at_batching_strategy_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_expiration_policies_linked_to_no_container_images_spec.rb'
     - 'spec/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_encrypted_values_on_projects_spec.rb'
     - 'spec/lib/gitlab/background_migration/reset_duplicate_ci_runners_token_values_on_projects_spec.rb'
     - 'spec/lib/gitlab/ci/reports/security/scanner_spec.rb'
diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml
index da56c283180..450010d6c95 100644
--- a/.rubocop_todo/lint/symbol_conversion.yml
+++ b/.rubocop_todo/lint/symbol_conversion.yml
@@ -36,7 +36,6 @@ Lint/SymbolConversion:
     - 'ee/spec/helpers/ee/environments_helper_spec.rb'
     - 'ee/spec/helpers/subscriptions_helper_spec.rb'
     - 'ee/spec/lib/arkose/logger_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/recalculate_vulnerability_finding_signatures_for_findings_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/parsers/security/common_spec.rb'
     - 'ee/spec/lib/ee/gitlab/scim/params_parser_spec.rb'
     - 'ee/spec/lib/ee/gitlab/tracking_spec.rb'
@@ -126,7 +125,6 @@ Lint/SymbolConversion:
     - 'spec/lib/gitlab/grape_logging/loggers/token_logger_spec.rb'
     - 'spec/lib/gitlab/harbor/client_spec.rb'
     - 'spec/lib/gitlab/harbor/query_spec.rb'
-    - 'spec/lib/gitlab/import_export/json/legacy_reader/hash_spec.rb'
     - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
     - 'spec/lib/gitlab/lfs/client_spec.rb'
     - 'spec/lib/gitlab/metrics/subscribers/active_record_spec.rb'
diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml
index 263cbf9e424..59e89969751 100644
--- a/.rubocop_todo/lint/unused_block_argument.yml
+++ b/.rubocop_todo/lint/unused_block_argument.yml
@@ -33,7 +33,6 @@ Lint/UnusedBlockArgument:
     - 'app/models/clusters/cluster.rb'
     - 'app/models/concerns/atomic_internal_id.rb'
     - 'app/models/concerns/avatarable.rb'
-    - 'app/models/concerns/enum_with_nil.rb'
     - 'app/models/concerns/mentionable.rb'
     - 'app/models/customer_relations/organization.rb'
     - 'app/models/integration.rb'
@@ -87,7 +86,6 @@ Lint/UnusedBlockArgument:
     - 'config/initializers/warden.rb'
     - 'config/routes/project.rb'
     - 'config/routes/wiki.rb'
-    - 'db/post_migrate/20211117084814_migrate_remaining_u2f_registrations.rb'
     - 'ee/app/finders/security/training_providers/kontra_url_finder.rb'
     - 'ee/app/finders/security/training_providers/secure_code_warrior_url_finder.rb'
     - 'ee/app/graphql/resolvers/incident_management/escalation_policies_resolver.rb'
@@ -141,7 +139,6 @@ Lint/UnusedBlockArgument:
     - 'ee/spec/graphql/resolvers/analytics/contribution_analytics/contributions_resolver_spec.rb'
     - 'ee/spec/lib/compliance_management/compliance_report/commit_loader_spec.rb'
     - 'ee/spec/lib/ee/gitlab/application_context_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used_spec.rb'
     - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb'
     - 'ee/spec/lib/gitlab/insights/project_insights_config_spec.rb'
     - 'ee/spec/lib/gitlab/usage_data_metrics_spec.rb'
@@ -333,7 +330,6 @@ Lint/UnusedBlockArgument:
     - 'spec/lib/feature_spec.rb'
     - 'spec/lib/gitlab/auth/saml/user_spec.rb'
     - 'spec/lib/gitlab/background_migration/cleanup_draft_data_from_faulty_regex_spec.rb'
-    - 'spec/lib/gitlab/background_migration/populate_vulnerability_reads_spec.rb'
     - 'spec/lib/gitlab/ci/parsers/terraform/tfplan_spec.rb'
     - 'spec/lib/gitlab/ci/parsers/test/junit_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/logger_spec.rb'
@@ -364,7 +360,6 @@ Lint/UnusedBlockArgument:
     - 'spec/lib/gitlab/utils/usage_data_spec.rb'
     - 'spec/lib/mattermost/session_spec.rb'
     - 'spec/mailers/notify_spec.rb'
-    - 'spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb'
     - 'spec/models/active_session_spec.rb'
     - 'spec/models/ci/build_spec.rb'
     - 'spec/models/concerns/ci/partitionable/switch_spec.rb'
@@ -390,7 +385,6 @@ Lint/UnusedBlockArgument:
     - 'spec/services/snippets/update_service_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/atlassian/jira_connect/schemata.rb'
-    - 'spec/support/cycle_analytics_helpers/test_generation.rb'
     - 'spec/support/database/prevent_cross_database_modification.rb'
     - 'spec/support/graphql/subscriptions/action_cable/mock_action_cable.rb'
     - 'spec/support/helpers/cycle_analytics_helpers.rb'
diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
index 0d6f91336cb..0321c4409c6 100644
--- a/.rubocop_todo/lint/unused_method_argument.yml
+++ b/.rubocop_todo/lint/unused_method_argument.yml
@@ -105,7 +105,6 @@ Lint/UnusedMethodArgument:
     - 'app/models/ci/runner.rb'
     - 'app/models/concerns/bulk_insert_safe.rb'
     - 'app/models/concerns/cache_markdown_field.rb'
-    - 'app/models/concerns/ci/partitionable/partitioned_filter.rb'
     - 'app/models/concerns/cross_database_modification.rb'
     - 'app/models/concerns/issuable.rb'
     - 'app/models/concerns/mentionable.rb'
@@ -326,7 +325,6 @@ Lint/UnusedMethodArgument:
     - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/members_helpers_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/notes_helpers_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/drop_invalid_remediations_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition_spec.rb'
     - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb'
     - 'ee/spec/lib/gitlab/patch/geo_database_tasks_spec.rb'
@@ -384,7 +382,6 @@ Lint/UnusedMethodArgument:
     - 'lib/gitlab/auth/database/authentication.rb'
     - 'lib/gitlab/auth/ldap/access.rb'
     - 'lib/gitlab/auth/ldap/adapter.rb'
-    - 'lib/gitlab/background_migration/backfill_ci_queuing_tables.rb'
     - 'lib/gitlab/background_migration/backfill_project_settings.rb'
     - 'lib/gitlab/background_migration/batching_strategies/backfill_project_namespace_per_group_batching_strategy.rb'
     - 'lib/gitlab/background_migration/batching_strategies/loose_index_scan_batching_strategy.rb'
@@ -599,8 +596,6 @@ Lint/UnusedMethodArgument:
     - 'spec/lib/banzai/reference_parser/base_parser_spec.rb'
     - 'spec/lib/gitlab/auth_spec.rb'
     - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb'
-    - 'spec/lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_duplicate_vulnerabilities_findings_spec.rb'
     - 'spec/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings_spec.rb'
     - 'spec/lib/gitlab/background_migration/set_correct_vulnerability_state_spec.rb'
     - 'spec/lib/gitlab/background_migration/truncate_overlong_vulnerability_html_titles_spec.rb'
@@ -611,9 +606,6 @@ Lint/UnusedMethodArgument:
     - 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb'
     - 'spec/lib/gitlab/sidekiq_middleware/worker_context/server_spec.rb'
     - 'spec/lib/gitlab/sidekiq_middleware_spec.rb'
-    - 'spec/migrations/20211018152654_schedule_remove_duplicate_vulnerabilities_findings3_spec.rb'
-    - 'spec/migrations/20211116111644_schedule_remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings_spec.rb'
-    - 'spec/migrations/20211207135331_schedule_recalculate_uuid_on_vulnerabilities_occurrences4_spec.rb'
     - 'spec/models/concerns/from_set_operator_spec.rb'
     - 'spec/models/concerns/redis_cacheable_spec.rb'
     - 'spec/policies/resource_state_event_policy_spec.rb'