Add latest changes from gitlab-org/gitlab@master

A-SunsetMkt-Forks · Jun 6, 2024 · ed0464b · ed0464b
1 parent d562ddd
commit ed0464b
Show file tree

Hide file tree

Showing 161 changed files with 1,253 additions and 5,446 deletions.
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
@@ -1143,7 +1143,6 @@ lib/gitlab/checks/**
 /app/models/oauth_access_token.rb
 /app/models/personal_access_token.rb
 /app/models/project_authorization.rb
-/app/models/token_with_iv.rb
 /app/models/webauthn_registration.rb
 /app/policies/personal_access_token_policy.rb
 /app/serializers/access_token_entity_base.rb

diff --git a/.rubocop_todo/database/rescue_query_canceled.yml b/.rubocop_todo/database/rescue_query_canceled.yml
@@ -2,6 +2,5 @@
 Database/RescueQueryCanceled:
   Exclude:
     - 'app/services/issues/relative_position_rebalancing_service.rb'
-    - 'lib/gitlab/background_migration/backfill_work_item_type_id_for_issues.rb'
     - 'lib/gitlab/database/batch_counter.rb'
     - 'lib/gitlab/issuables_count_for_state.rb'
diff --git a/.rubocop_todo/database/rescue_statement_timeout.yml b/.rubocop_todo/database/rescue_statement_timeout.yml
@@ -2,4 +2,3 @@
 Database/RescueStatementTimeout:
   Exclude:
     - 'app/services/issues/relative_position_rebalancing_service.rb'
-    - 'lib/gitlab/background_migration/backfill_work_item_type_id_for_issues.rb'
diff --git a/.rubocop_todo/gitlab/avoid_gitlab_instance_checks.yml b/.rubocop_todo/gitlab/avoid_gitlab_instance_checks.yml
@@ -101,9 +101,7 @@ Gitlab/AvoidGitlabInstanceChecks:
     - 'ee/lib/ee/api/namespaces.rb'
     - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_storage_size_with_recent_size.rb'
     - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_storage_size_without_pipeline_artifacts_size_job.rb'
-    - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_storage_size_without_uploads_size.rb'
     - 'ee/lib/ee/gitlab/background_migration/create_compliance_standards_adherence.rb'
-    - 'ee/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_identifiers.rb'
     - 'ee/lib/ee/gitlab/gon_helper.rb'
     - 'ee/lib/ee/gitlab/personal_access_tokens/service_account_token_validator.rb'
     - 'ee/lib/ee/gitlab/scim/base_provisioning_service.rb'

diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml
@@ -1325,7 +1325,6 @@ Gitlab/BoundedContexts:
     - 'app/models/time_tracking/timelog_category.rb'
     - 'app/models/timelog.rb'
     - 'app/models/todo.rb'
-    - 'app/models/token_with_iv.rb'
     - 'app/models/tree.rb'
     - 'app/models/trending_project.rb'
     - 'app/models/upload.rb'

diff --git a/.rubocop_todo/layout/array_alignment.yml b/.rubocop_todo/layout/array_alignment.yml
@@ -211,7 +211,6 @@ Layout/ArrayAlignment:
     - 'spec/lib/banzai/reference_parser/design_parser_spec.rb'
     - 'spec/lib/container_registry/path_spec.rb'
     - 'spec/lib/gitlab/auth/saml/user_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphaned_operational_vulnerabilities_spec.rb'
     - 'spec/lib/gitlab/background_migration/job_coordinator_spec.rb'
     - 'spec/lib/gitlab/backtrace_cleaner_spec.rb'
     - 'spec/lib/gitlab/ci/config/entry/bridge_spec.rb'

diff --git a/.rubocop_todo/layout/class_structure.yml b/.rubocop_todo/layout/class_structure.yml
@@ -357,7 +357,6 @@ Layout/ClassStructure:
     - 'lib/gitlab/background_migration/backfill_branch_protection_namespace_setting.rb'
     - 'lib/gitlab/background_migration/backfill_default_branch_protection_namespace_setting.rb'
     - 'lib/gitlab/background_migration/job_coordinator.rb'
-    - 'lib/gitlab/background_migration/migrate_remediations_for_vulnerability_findings.rb'
     - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb'
     - 'lib/gitlab/background_task.rb'
     - 'lib/gitlab/backup_logger.rb'

diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
@@ -268,7 +268,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'ee/spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb'
     - 'ee/spec/lib/banzai/issuable_extractor_spec.rb'
     - 'ee/spec/lib/ee/api/helpers/members_helpers_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/backfill_epic_cache_counts_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners_spec.rb'
     - 'ee/spec/lib/ee/gitlab/git_access_design_spec.rb'
     - 'ee/spec/lib/ee/gitlab/git_access_snippet_spec.rb'
@@ -363,7 +362,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'lib/gitlab/auth/otp/fortinet.rb'
     - 'lib/gitlab/background_migration/backfill_imported_issue_search_data.rb'
     - 'lib/gitlab/background_migration/backfill_issue_search_data.rb'
-    - 'lib/gitlab/background_migration/backfill_project_namespace_details.rb'
     - 'lib/gitlab/background_migration/mailers/unconfirm_mailer.rb'
     - 'lib/gitlab/ci/secure_files/mobile_provision.rb'
     - 'lib/gitlab/cleanup/remote_uploads.rb'

diff --git a/.rubocop_todo/lint/missing_cop_enable_directive.yml b/.rubocop_todo/lint/missing_cop_enable_directive.yml
@@ -50,7 +50,6 @@ Lint/MissingCopEnableDirective:
     - 'app/models/commit_collection.rb'
     - 'app/models/concerns/batch_destroy_dependent_associations.rb'
     - 'app/models/concerns/deployment_platform.rb'
-    - 'app/models/token_with_iv.rb'
     - 'app/models/wiki_page.rb'
     - 'app/services/ci/queue/build_queue_service.rb'
     - 'app/services/commits/change_service.rb'

diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
@@ -115,9 +115,6 @@ Lint/RedundantCopDisableDirective:
     - 'ee/lib/api/audit_events.rb'
     - 'ee/lib/api/dora/metrics.rb'
     - 'ee/lib/ee/api/entities/analytics/code_review/merge_request.rb'
-    - 'ee/lib/ee/gitlab/background_migration/backfill_epic_cache_counts.rb'
-    - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_storage_size_without_uploads_size.rb'
-    - 'ee/lib/ee/gitlab/background_migration/fix_security_scan_statuses.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb'
     - 'ee/lib/ee/gitlab/background_migration/purge_stale_security_scans.rb'
     - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb'
@@ -129,7 +126,6 @@ Lint/RedundantCopDisableDirective:
     - 'ee/spec/features/boards/user_visits_board_spec.rb'
     - 'ee/spec/features/groups/settings/domain_verification_spec.rb'
     - 'ee/spec/helpers/ee/releases_helper_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/backfill_project_statistics_storage_size_without_uploads_size_spec.rb'
     - 'ee/spec/lib/ee/gitlab/issuable_metadata_spec.rb'
     - 'ee/spec/lib/elastic/latest/project_instance_proxy_spec.rb'
     - 'ee/spec/lib/gitlab/geo/log_helpers_spec.rb'
@@ -155,10 +151,7 @@ Lint/RedundantCopDisableDirective:
     - 'lib/gitlab/analytics/cycle_analytics/records_fetcher.rb'
     - 'lib/gitlab/application_context.rb'
     - 'lib/gitlab/background_migration/backfill_issue_search_data.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/fix_incoherent_packages_size_on_project_statistics.rb'
-    - 'lib/gitlab/background_migration/re_expire_o_auth_tokens.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/cache/request_cache.rb'
@@ -230,7 +223,6 @@ Lint/RedundantCopDisableDirective:
     - 'spec/graphql/resolvers/base_resolver_spec.rb'
     - 'spec/helpers/releases_helper_spec.rb'
     - 'spec/lib/gitlab/avatar_cache_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_cluster_agents_has_vulnerabilities_spec.rb'
     - '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/ci/reports/security/scanner_spec.rb'

diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
@@ -553,7 +553,6 @@ Lint/UnusedMethodArgument:
     - 'spec/lib/gitlab/auth_spec.rb'
     - 'spec/lib/gitlab/background_migration/batched_migration_job_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'
     - 'spec/lib/gitlab/cache/request_cache_spec.rb'
     - 'spec/lib/gitlab/middleware/same_site_cookies_spec.rb'
     - 'spec/lib/gitlab/otp_key_rotator_spec.rb'

diff --git a/.rubocop_todo/rails/find_each.yml b/.rubocop_todo/rails/find_each.yml
@@ -11,7 +11,6 @@ Rails/FindEach:
     - 'app/views/issues/_issues_calendar.ics.ruby'
     - 'db/post_migrate/20231003045342_migrate_sidekiq_namespaced_jobs.rb'
     - 'ee/app/workers/compliance_management/merge_requests/compliance_violations_consistency_worker.rb'
-    - 'ee/lib/ee/gitlab/background_migration/backfill_compliance_violations.rb'
     - 'ee/lib/ee/gitlab/background_migration/create_compliance_standards_adherence.rb'
     - 'ee/spec/elastic/migrate/20230901120542_force_reindex_commits_from_main_index_spec.rb'
     - 'ee/spec/elastic/migrate/20231004124852_reindex_and_remove_leftover_notes_from_main_index_spec.rb'

diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
@@ -15,7 +15,6 @@ RSpec/ExpectChange:
     - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_cadences_pipeline_spec.rb'
     - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_pipeline_spec.rb'
     - 'ee/spec/lib/ee/feature_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners_spec.rb'
     - 'ee/spec/lib/gitlab/audit/auditor_spec.rb'
     - 'ee/spec/lib/gitlab/auth/ldap/access_spec.rb'
@@ -211,9 +210,6 @@ RSpec/ExpectChange:
     - 'spec/lib/gitlab/audit/auditor_spec.rb'
     - 'spec/lib/gitlab/auth_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphaned_operational_vulnerabilities_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_self_managed_wiki_notes_spec.rb'
-    - 'spec/lib/gitlab/background_migration/rename_task_system_note_to_checklist_item_spec.rb'
     - 'spec/lib/gitlab/ci/pipeline/chain/assign_partition_spec.rb'
     - 'spec/lib/gitlab/ci/reports/accessibility_reports_spec.rb'
     - 'spec/lib/gitlab/ci/reports/test_suite_spec.rb'

diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
@@ -562,16 +562,12 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/proxy_spec.rb'
     - 'ee/spec/lib/ee/gitlab/auth/request_authenticator_spec.rb'
     - 'ee/spec/lib/ee/gitlab/auth/saml/identity_linker_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/backfill_epic_cache_counts_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/backfill_iteration_cadence_id_for_boards_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/delete_invalid_epic_issues_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_merge_request_rules_with_security_orchestration_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_project_rules_with_security_orchestration_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/need_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/needs_spec.rb'
@@ -2701,14 +2697,10 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/auth/user_access_denied_reason_spec.rb'
     - 'spec/lib/gitlab/authorized_keys_spec.rb'
     - 'spec/lib/gitlab/avatar_cache_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_cluster_agents_has_vulnerabilities_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_internal_on_notes_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_namespace_details_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_namespace_id_of_vulnerability_reads_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_note_discussion_id_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_feature_package_registry_access_level_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_project_namespace_details_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_topics_title_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent_spec.rb'
@@ -2719,22 +2711,14 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/background_migration/batching_strategies/loose_index_scan_batching_strategy_spec.rb'
     - 'spec/lib/gitlab/background_migration/batching_strategies/primary_key_batching_strategy_spec.rb'
     - 'spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphaned_operational_vulnerabilities_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_project_rules_spec.rb'
     - 'spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_licence_for_recent_public_projects_spec.rb'
     - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_inactive_public_projects_spec.rb'
     - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb'
     - 'spec/lib/gitlab/background_migration/job_coordinator_spec.rb'
     - 'spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb'
     - 'spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb'
     - 'spec/lib/gitlab/background_migration/mailers/unconfirm_mailer_spec.rb'
     - 'spec/lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations_spec.rb'
-    - 'spec/lib/gitlab/background_migration/populate_projects_star_count_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_self_managed_wiki_notes_spec.rb'
-    - 'spec/lib/gitlab/background_migration/rename_task_system_note_to_checklist_item_spec.rb'
     - 'spec/lib/gitlab/background_migration/set_correct_vulnerability_state_spec.rb'
     - 'spec/lib/gitlab/background_migration/set_legacy_open_source_license_available_for_non_public_projects_spec.rb'
     - 'spec/lib/gitlab/background_migration/update_ci_pipeline_artifacts_unknown_locked_status_spec.rb'
@@ -4585,7 +4569,6 @@ RSpec/FeatureCategory:
     - 'spec/models/term_agreement_spec.rb'
     - 'spec/models/time_tracking/timelog_category_spec.rb'
     - 'spec/models/todo_spec.rb'
-    - 'spec/models/token_with_iv_spec.rb'
     - 'spec/models/trending_project_spec.rb'
     - 'spec/models/upload_spec.rb'
     - 'spec/models/uploads/fog_spec.rb'

diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
@@ -290,16 +290,10 @@ RSpec/NamedSubject:
     - 'ee/spec/lib/ee/gitlab/auth/current_user_mode_spec.rb'
     - 'ee/spec/lib/ee/gitlab/auth/request_authenticator_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/backfill_dismissal_reason_in_vulnerability_reads_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/backfill_epic_cache_counts_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/backfill_iteration_cadence_id_for_boards_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/delete_invalid_epic_issues_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/delete_orphaned_transferred_project_approval_rules_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/fix_approval_project_rules_without_protected_branches_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_identifiers_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_merge_request_rules_with_security_orchestration_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_project_rules_with_security_orchestration_spec.rb'
     - 'ee/spec/lib/ee/gitlab/checks/push_rule_check_spec.rb'
     - 'ee/spec/lib/ee/gitlab/checks/push_rules/branch_check_spec.rb'
     - 'ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb'
@@ -1779,16 +1773,10 @@ RSpec/NamedSubject:
     - 'spec/lib/gitlab/background_migration/delete_invalid_protected_branch_merge_access_levels_spec.rb'
     - 'spec/lib/gitlab/background_migration/delete_invalid_protected_branch_push_access_levels_spec.rb'
     - 'spec/lib/gitlab/background_migration/delete_invalid_protected_tag_create_access_levels_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules2_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_project_rules2_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_project_rules_spec.rb'
     - 'spec/lib/gitlab/background_migration/legacy_uploads_migrator_spec.rb'
     - 'spec/lib/gitlab/background_migration/mailers/unconfirm_mailer_spec.rb'
-    - 'spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb'
     - 'spec/lib/gitlab/background_migration/populate_vulnerability_dismissal_fields_spec.rb'
     - 'spec/lib/gitlab/background_migration/redis/backfill_project_pipeline_status_ttl_spec.rb'
-    - 'spec/lib/gitlab/background_migration/truncate_overlong_vulnerability_html_titles_spec.rb'
     - 'spec/lib/gitlab/background_migration/update_ci_pipeline_artifacts_unknown_locked_status_spec.rb'
     - 'spec/lib/gitlab/background_task_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/parallel_importer_spec.rb'

diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
@@ -93,7 +93,6 @@ Style/EmptyMethod:
     - 'lib/gitlab/alert_management/payload/base.rb'
     - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb'
     - 'lib/gitlab/background_migration/create_security_setting.rb'
-    - 'lib/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb'
     - 'lib/gitlab/background_migration/delete_invalid_epic_issues.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb'