Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 34 deletions

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index ecbb2c967c9..99a1ff30fc3 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -532,17 +532,6 @@ Layout/ArgumentAlignment:
     - 'app/models/ci/running_build.rb'
     - 'app/models/ci/stage.rb'
     - 'app/models/clusters/kubernetes_namespace.rb'
-    - 'app/models/concerns/bulk_member_access_load.rb'
-    - 'app/models/concerns/ci/metadatable.rb'
-    - 'app/models/concerns/discussion_on_diff.rb'
-    - 'app/models/concerns/group_descendant.rb'
-    - 'app/models/concerns/integrations/has_issue_tracker_fields.rb'
-    - 'app/models/concerns/issuable.rb'
-    - 'app/models/concerns/limitable.rb'
-    - 'app/models/concerns/mentionable/reference_regexes.rb'
-    - 'app/models/concerns/resolvable_discussion.rb'
-    - 'app/models/concerns/vulnerability_finding_helpers.rb'
-    - 'app/models/concerns/web_hooks/auto_disabling.rb'
     - 'app/models/container_repository.rb'
     - 'app/models/cycle_analytics/project_level_stage_adapter.rb'
     - 'app/models/deployment.rb'
@@ -1142,8 +1131,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/mailers/emails/namespace_storage_usage_mailer.rb'
     - 'ee/app/models/approval_wrapped_rule.rb'
     - 'ee/app/models/ci/minutes/notification.rb'
-    - 'ee/app/models/concerns/ee/protected_ref_access.rb'
-    - 'ee/app/models/concerns/geo/verifiable_replicator.rb'
     - 'ee/app/models/dast/pre_scan_verification.rb'
     - 'ee/app/models/deployments/approval.rb'
     - 'ee/app/models/ee/application_setting.rb'
@@ -1523,12 +1510,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/models/approval_wrapped_code_owner_rule_spec.rb'
     - 'ee/spec/models/ci/bridge_spec.rb'
     - 'ee/spec/models/ci/build_spec.rb'
-    - 'ee/spec/models/concerns/elastic/issue_spec.rb'
-    - 'ee/spec/models/concerns/elastic/merge_request_spec.rb'
-    - 'ee/spec/models/concerns/elastic/note_spec.rb'
-    - 'ee/spec/models/concerns/elastic/project_spec.rb'
-    - 'ee/spec/models/concerns/elastic/repository_spec.rb'
-    - 'ee/spec/models/concerns/elastic/snippet_spec.rb'
     - 'ee/spec/models/dast/pre_scan_verification_step_spec.rb'
     - 'ee/spec/models/dast_site_profile_spec.rb'
     - 'ee/spec/models/deployments/approval_summary_spec.rb'
@@ -2611,13 +2592,6 @@ Layout/ArgumentAlignment:
     - 'spec/models/clusters/kubernetes_namespace_spec.rb'
     - 'spec/models/clusters/platforms/kubernetes_spec.rb'
     - 'spec/models/commit_spec.rb'
-    - 'spec/models/concerns/ci/partitionable/switch_spec.rb'
-    - 'spec/models/concerns/ci/partitionable_spec.rb'
-    - 'spec/models/concerns/ci/track_environment_usage_spec.rb'
-    - 'spec/models/concerns/database_event_tracking_spec.rb'
-    - 'spec/models/concerns/deployment_platform_spec.rb'
-    - 'spec/models/concerns/issuable_spec.rb'
-    - 'spec/models/concerns/token_authenticatable_spec.rb'
     - 'spec/models/container_repository_spec.rb'
     - 'spec/models/deployment_spec.rb'
     - 'spec/models/design_management/version_spec.rb'
@@ -2995,11 +2969,6 @@ Layout/ArgumentAlignment:
     - 'spec/support/shared_examples/lib/sentry/client_shared_examples.rb'
     - 'spec/support/shared_examples/models/chat_integration_shared_examples.rb'
     - 'spec/support/shared_examples/models/clusters/prometheus_client_shared.rb'
-    - 'spec/support/shared_examples/models/concerns/auto_disabling_hooks_shared_examples.rb'
-    - 'spec/support/shared_examples/models/concerns/cascading_namespace_setting_shared_examples.rb'
-    - 'spec/support/shared_examples/models/concerns/integrations/slack_mattermost_notifier_shared_examples.rb'
-    - 'spec/support/shared_examples/models/concerns/timebox_shared_examples.rb'
-    - 'spec/support/shared_examples/models/concerns/unstoppable_hooks_shared_examples.rb'
     - 'spec/support/shared_examples/models/diff_note_after_commit_shared_examples.rb'
     - 'spec/support/shared_examples/models/member_shared_examples.rb'
     - 'spec/support/shared_examples/observability/csp_shared_examples.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index d3a55c5d9c5..fc00a030fe1 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -2318,7 +2318,6 @@ RSpec/ContextWording:
     - 'spec/models/personal_access_token_spec.rb'
     - 'spec/models/plan_limits_spec.rb'
     - 'spec/models/preloaders/labels_preloader_spec.rb'
-    - 'spec/models/preloaders/users_max_access_level_in_projects_preloader_spec.rb'
     - 'spec/models/project_authorization_spec.rb'
     - 'spec/models/project_feature_spec.rb'
     - 'spec/models/project_feature_usage_spec.rb'
diff --git a/.rubocop_todo/rspec/described_class.yml b/.rubocop_todo/rspec/described_class.yml
index 3a505885c9a..94c44a144bf 100644
--- a/.rubocop_todo/rspec/described_class.yml
+++ b/.rubocop_todo/rspec/described_class.yml
@@ -162,7 +162,6 @@ RSpec/DescribedClass:
     - 'spec/models/performance_monitoring/prometheus_panel_spec.rb'
     - 'spec/models/postgresql/detached_partition_spec.rb'
     - 'spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb'
-    - 'spec/models/preloaders/users_max_access_level_in_projects_preloader_spec.rb'
     - 'spec/models/project_spec.rb'
     - 'spec/models/projects/topic_spec.rb'
     - 'spec/models/release_highlight_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 6ba95776245..b72df55e9a8 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -5444,7 +5444,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/models/preloaders/project_root_ancestor_preloader_spec.rb'
     - 'spec/models/preloaders/user_max_access_level_in_groups_preloader_spec.rb'
     - 'spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb'
-    - 'spec/models/preloaders/users_max_access_level_in_projects_preloader_spec.rb'
     - 'spec/models/product_analytics_event_spec.rb'
     - 'spec/models/programming_language_spec.rb'
     - 'spec/models/project_authorization_spec.rb'