Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 6 deletions

diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml
index cf32e66d3e0..01a6e4ddeb4 100644
--- a/.rubocop_todo/layout/hash_alignment.yml
+++ b/.rubocop_todo/layout/hash_alignment.yml
@@ -2,7 +2,6 @@
 # Cop supports --autocorrect.
 Layout/HashAlignment:
   Exclude:
-    - 'config/initializers/rspec_profiling.rb'
     - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
     - 'ee/spec/support/shared_examples/controllers/analytics/cycle_analytics/value_stream_shared_examples.rb'
     - 'lib/gitlab/redis/multi_store.rb'
diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
index 7e5714ef918..2c9d5c3da14 100644
--- a/.rubocop_todo/lint/unused_method_argument.yml
+++ b/.rubocop_todo/lint/unused_method_argument.yml
@@ -217,7 +217,6 @@ Lint/UnusedMethodArgument:
     - 'config/initializers/active_record_preloader.rb'
     - 'config/initializers/active_record_table_definition.rb'
     - 'config/initializers/forbid_sidekiq_in_transactions.rb'
-    - 'config/initializers/rspec_profiling.rb'
     - 'config/object_store_settings.rb'
     - 'ee/app/controllers/ee/projects/protected_branches_controller.rb'
     - 'ee/app/controllers/groups/omniauth_callbacks_controller.rb'
@@ -266,7 +265,6 @@ Lint/UnusedMethodArgument:
     - 'ee/app/serializers/analytics/cycle_analytics/value_stream_errors_serializer.rb'
     - 'ee/app/services/app_sec/dast/scans/run_service.rb'
     - 'ee/app/services/audit_events/runners_token_audit_event_service.rb'
-    - 'ee/app/services/automation/dispatch_service.rb'
     - 'ee/app/services/boards/epic_lists/update_service.rb'
     - 'ee/app/services/concerns/incident_management/oncall_rotations/shared_rotation_logic.rb'
     - 'ee/app/services/ee/merge_requests/merge_base_service.rb'
@@ -276,7 +274,6 @@ Lint/UnusedMethodArgument:
     - 'ee/app/services/projects/update_mirror_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/process_scan_result_policy_service.rb'
     - 'ee/app/validators/vulnerabilities/cvss_vector_validator.rb'
-    - 'ee/app/workers/automation/execute_rule_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/refresh_seats_worker.rb'
     - 'ee/db/fixtures/development/20_burndown.rb'
     - 'ee/lib/audit/compliance_framework_changes_auditor.rb'
diff --git a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
index 45c060ebe03..c0f48f83492 100644
--- a/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
+++ b/.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml
@@ -315,7 +315,6 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'ee/app/workers/approval_rules/external_approval_rule_payload_worker.rb'
     - 'ee/app/workers/arkose/blocked_users_report_worker.rb'
     - 'ee/app/workers/auth/saml_group_sync_worker.rb'
-    - 'ee/app/workers/automation/execute_rule_worker.rb'
     - 'ee/app/workers/ci/minutes/refresh_cached_data_worker.rb'
     - 'ee/app/workers/ci/minutes/update_project_and_namespace_usage_worker.rb'
     - 'ee/app/workers/ci/sync_reports_to_report_approval_rules_worker.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 1119f212b4f..1a6226514e6 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -1108,7 +1108,6 @@ Style/InlineDisableAnnotation:
     - 'config/initializers/mail_starttls_patch.rb'
     - 'config/initializers/postgres_cte_as_materialized.rb'
     - 'config/initializers/rack_VULNDB-255039_patch.rb'
-    - 'config/initializers/rspec_profiling.rb'
     - 'config/initializers/safe_session_store_patch.rb'
     - 'config/initializers/sidekiq.rb'
     - 'config/initializers/warden.rb'