Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 43 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 359b6838873..4e4d3537c9e 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1979,19 +1979,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb'
     - 'spec/lib/gitlab/auth/saml/auth_hash_spec.rb'
     - 'spec/lib/gitlab/auth/saml/user_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_cluster_agents_has_vulnerabilities_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_environment_tiers_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_group_features_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_imported_issue_search_data_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_namespace_details_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_namespace_id_for_namespace_route_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_namespace_id_of_vulnerability_reads_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_project_feature_package_registry_access_level_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_project_member_namespace_id_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_project_namespace_details_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_releases_author_id_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_vulnerability_reads_cluster_agent_spec.rb'
     - 'spec/lib/gitlab/background_migration/batched_migration_job_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'
@@ -2010,16 +1997,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics_spec.rb'
     - 'spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb'
     - 'spec/lib/gitlab/background_migration/migrate_shimo_confluence_integration_category_spec.rb'
-    - 'spec/lib/gitlab/background_migration/nullify_orphan_runner_id_on_ci_builds_spec.rb'
-    - 'spec/lib/gitlab/background_migration/prune_stale_project_export_jobs_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_backfilled_job_artifacts_expire_at_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings_spec.rb'
-    - 'spec/lib/gitlab/background_migration/remove_self_managed_wiki_notes_spec.rb'
-    - 'spec/lib/gitlab/background_migration/reset_too_many_tags_skipped_registry_imports_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_delayed_project_removal_to_null_for_user_namespaces_spec.rb'
-    - 'spec/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/project_creator_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/wiki_formatter_spec.rb'
@@ -2406,16 +2383,6 @@ Layout/ArgumentAlignment:
     - 'spec/services/work_items/task_list_reference_removal_service_spec.rb'
     - 'spec/services/work_items/widgets/description_service/update_service_spec.rb'
     - 'spec/sidekiq/cron/job_gem_dependency_spec.rb'
-    - 'spec/support/import_export/export_file_helper.rb'
-    - 'spec/support/redis/redis_shared_examples.rb'
-    - 'spec/support/shared_examples/controllers/snippets_sort_order_shared_examples.rb'
-    - 'spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb'
-    - 'spec/support/shared_examples/features/search/redacted_search_results_shared_examples.rb'
-    - 'spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb'
-    - 'spec/support/shared_examples/graphql/members_shared_examples.rb'
-    - 'spec/support/shared_examples/graphql/mutation_shared_examples.rb'
-    - 'spec/support/shared_examples/graphql/mutations/set_assignees_shared_examples.rb'
-    - 'spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb'
     - 'spec/support/shared_examples/initializers/uses_gitlab_url_blocker_shared_examples.rb'
     - 'spec/support/shared_examples/integrations/integration_settings_form.rb'
     - 'spec/support/shared_examples/lib/gitlab/ci/ci_trace_shared_examples.rb'
diff --git a/.rubocop_todo/rails/pluck.yml b/.rubocop_todo/rails/pluck.yml
index 0f8a4d54687..4571e1ae19e 100644
--- a/.rubocop_todo/rails/pluck.yml
+++ b/.rubocop_todo/rails/pluck.yml
@@ -272,15 +272,5 @@ Rails/Pluck:
     - 'spec/support/helpers/api_helpers.rb'
     - 'spec/support/helpers/graphql_helpers.rb'
     - 'spec/support/matchers/background_migrations_matchers.rb'
-    - 'spec/support/shared_examples/graphql/mutation_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/labels_api_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/milestones_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/notes_shared_examples.rb'
-    - 'spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb'
-    - 'spec/support/shared_examples/services/packages_shared_examples.rb'
     - 'spec/tooling/docs/deprecation_handling_spec.rb'
     - 'tooling/docs/deprecation_handling.rb'