Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 9 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index e889a05ad36..c574688bf3f 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -397,7 +397,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/graphql/mutations/requirements_management/export_requirements_spec.rb'
     - 'ee/spec/helpers/billing_plans_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
-    - 'ee/spec/helpers/projects/security/policies_helper_spec.rb'
     - 'ee/spec/helpers/routing/pseudonymization_helper_spec.rb'
     - 'ee/spec/helpers/trial_status_widget_helper_spec.rb'
     - 'ee/spec/lib/analytics/group_activity_calculator_spec.rb'
@@ -475,7 +474,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/geo/file_registry_removal_service_spec.rb'
     - 'ee/spec/services/geo/repository_verification_primary_service_spec.rb'
-    - 'ee/spec/services/groups/recent_merge_requests_count_service_spec.rb'
     - 'ee/spec/services/merge_requests/reset_approvals_service_spec.rb'
     - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb'
     - 'ee/spec/services/namespaces/check_storage_size_service_spec.rb'
@@ -536,7 +534,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/background_migration/backfill_project_repositories.rb'
     - 'lib/gitlab/background_migration/batching_strategies/base_strategy.rb'
     - 'lib/gitlab/background_migration/legacy_upload_mover.rb'
-    - 'lib/gitlab/background_migration/migrate_stage_status.rb'
     - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb'
     - 'lib/gitlab/ci/config/entry/artifacts.rb'
     - 'lib/gitlab/ci/config/entry/bridge.rb'
@@ -570,7 +567,6 @@ Layout/ArgumentAlignment:
     - 'lib/gitlab/database_importers/instance_administrators/create_group.rb'
     - 'lib/gitlab/database_importers/self_monitoring/project/create_service.rb'
     - 'lib/gitlab/database_importers/self_monitoring/project/delete_service.rb'
-    - 'lib/gitlab/diff/custom_diff.rb'
     - 'lib/gitlab/diff/file.rb'
     - 'lib/gitlab/diff/file_collection/base.rb'
     - 'lib/gitlab/diff/suggestion.rb'
@@ -633,7 +629,6 @@ Layout/ArgumentAlignment:
     - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb'
     - 'spec/controllers/projects/pipelines/tests_controller_spec.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
-    - 'spec/controllers/projects/serverless/functions_controller_spec.rb'
     - 'spec/controllers/projects/settings/operations_controller_spec.rb'
     - 'spec/controllers/projects/tags_controller_spec.rb'
     - 'spec/controllers/projects/todos_controller_spec.rb'
@@ -674,7 +669,6 @@ Layout/ArgumentAlignment:
     - 'spec/features/projects/milestones/milestones_sorting_spec.rb'
     - 'spec/features/projects/pipelines/pipeline_spec.rb'
     - 'spec/features/projects/pipelines/pipelines_spec.rb'
-    - 'spec/features/projects/serverless/functions_spec.rb'
     - 'spec/features/refactor_blob_viewer_disabled/projects/files/editing_a_file_spec.rb'
     - 'spec/features/refactor_blob_viewer_disabled/projects/files/project_owner_creates_license_file_spec.rb'
     - 'spec/finders/ci/commit_statuses_finder_spec.rb'
@@ -897,7 +891,6 @@ Layout/ArgumentAlignment:
     - 'spec/services/namespaces/package_settings/update_service_spec.rb'
     - 'spec/services/notification_service_spec.rb'
     - 'spec/services/packages/debian/extract_metadata_service_spec.rb'
-    - 'spec/services/pod_logs/kubernetes_service_spec.rb'
     - 'spec/services/projects/destroy_service_spec.rb'
     - 'spec/services/security/merge_reports_service_spec.rb'
     - 'spec/services/system_notes/design_management_service_spec.rb'
@@ -940,8 +933,6 @@ Layout/ArgumentAlignment:
     - 'spec/views/projects/merge_requests/_commits.html.haml_spec.rb'
     - 'spec/views/projects/merge_requests/edit.html.haml_spec.rb'
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
-    - 'spec/workers/expire_job_cache_worker_spec.rb'
-    - 'spec/workers/expire_pipeline_cache_worker_spec.rb'
     - 'spec/workers/pipeline_notification_worker_spec.rb'
     - 'spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb'
     - 'spec/workers/update_external_pull_requests_worker_spec.rb'