Add latest changes from gitlab-org/gitlab@master

9 files changed, 0 insertions, 36 deletions

diff --git a/.rubocop_todo/fips/sha1.yml b/.rubocop_todo/fips/sha1.yml
index a9637295cab..f39ca78fd81 100644
--- a/.rubocop_todo/fips/sha1.yml
+++ b/.rubocop_todo/fips/sha1.yml
@@ -30,7 +30,6 @@ Fips/SHA1:
     - 'ee/spec/lib/gitlab/ci/reports/security/locations/dast_spec.rb'
     - 'ee/spec/lib/gitlab/ci/reports/security/locations/dependency_scanning_spec.rb'
     - 'ee/spec/migrations/update_vulnerability_occurrences_location_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/models/resource_weight_event_spec.rb'
     - 'ee/spec/models/vulnerabilities/finding_signature_spec.rb'
     - 'ee/spec/models/vulnerabilities/finding_spec.rb'
diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index a35783ac898..7de96b82445 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -923,7 +923,6 @@ Gitlab/NamespacedClass:
     - 'ee/app/models/license.rb'
     - 'ee/app/models/merge_request_block.rb'
     - 'ee/app/models/merge_request_diff_detail.rb'
-    - 'ee/app/models/merge_train.rb'
     - 'ee/app/models/namespace_limit.rb'
     - 'ee/app/models/path_lock.rb'
     - 'ee/app/models/productivity_analytics.rb'
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index af8f5a62980..289b732e958 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -1338,14 +1338,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/graphql/types/pipeline_security_report_finding_type_spec.rb'
     - 'ee/spec/graphql/types/project_type_spec.rb'
     - 'ee/spec/graphql/types/vulnerability_type_spec.rb'
-    - 'ee/spec/helpers/billing_plans_helper_spec.rb'
-    - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
-    - 'ee/spec/helpers/ee/namespace_user_cap_reached_alert_helper_spec.rb'
-    - 'ee/spec/helpers/ee/namespaces_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_registration_helper_spec.rb'
-    - 'ee/spec/helpers/license_monitoring_helper_spec.rb'
-    - 'ee/spec/helpers/projects_helper_spec.rb'
-    - 'ee/spec/helpers/vulnerabilities_helper_spec.rb'
     - 'ee/spec/lib/analytics/group_activity_calculator_spec.rb'
     - 'ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb'
     - 'ee/spec/lib/api/entities/protected_environments/approval_rule_for_summary_spec.rb'
@@ -1640,7 +1632,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/services/vulnerabilities/user_notes_count_service_spec.rb'
     - 'ee/spec/services/vulnerability_feedback/create_service_spec.rb'
     - 'ee/spec/services/vulnerability_merge_request_links/create_service_spec.rb'
-    - 'ee/spec/support/helpers/vulnerability_helpers.rb'
     - 'ee/spec/support/shared_examples/audit/audit_event_type_stream_shared_examples.rb'
     - 'ee/spec/support/shared_examples/controllers/analytics/cycle_analytics/shared_stage_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/credentials_inventory_shared_examples.rb'
@@ -2173,18 +2164,6 @@ Layout/ArgumentAlignment:
     - 'spec/graphql/types/project_type_spec.rb'
     - 'spec/graphql/types/root_storage_statistics_type_spec.rb'
     - 'spec/graphql/types/todo_type_spec.rb'
-    - 'spec/helpers/avatars_helper_spec.rb'
-    - 'spec/helpers/emoji_helper_spec.rb'
-    - 'spec/helpers/feature_flags_helper_spec.rb'
-    - 'spec/helpers/namespaces_helper_spec.rb'
-    - 'spec/helpers/notify_helper_spec.rb'
-    - 'spec/helpers/page_layout_helper_spec.rb'
-    - 'spec/helpers/routing/pseudonymization_helper_spec.rb'
-    - 'spec/helpers/storage_helper_spec.rb'
-    - 'spec/helpers/todos_helper_spec.rb'
-    - 'spec/helpers/users/callouts_helper_spec.rb'
-    - 'spec/helpers/users/group_callouts_helper_spec.rb'
-    - 'spec/helpers/visibility_level_helper_spec.rb'
     - 'spec/initializers/00_rails_disable_joins_spec.rb'
     - 'spec/initializers/secret_token_spec.rb'
     - 'spec/lib/api/every_api_endpoint_spec.rb'
@@ -2756,13 +2735,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/helpers/api_internal_base_helpers.rb'
-    - 'spec/support/helpers/board_helpers.rb'
-    - 'spec/support/helpers/ci/source_pipeline_helpers.rb'
-    - 'spec/support/helpers/feature_flag_helpers.rb'
-    - 'spec/support/helpers/graphql_helpers.rb'
-    - 'spec/support/helpers/stub_object_storage.rb'
-    - 'spec/support/helpers/workhorse_helpers.rb'
     - 'spec/support/import_export/export_file_helper.rb'
     - 'spec/support/redis/redis_shared_examples.rb'
     - 'spec/support/shared_contexts/bulk_imports_requests_shared_context.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 86faf32e8be..2499b2ee194 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -2117,7 +2117,6 @@ Layout/LineLength:
     - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/merge_requests/compliance_violation_spec.rb'
     - 'ee/spec/models/merge_requests/external_status_check_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
     - 'ee/spec/models/note_spec.rb'
     - 'ee/spec/models/packages/package_file_spec.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index c311f562e93..144b4eb04a7 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -223,7 +223,6 @@ Layout/SpaceInLambdaLiteral:
     - 'ee/app/models/iterations/cadence.rb'
     - 'ee/app/models/merge_request_block.rb'
     - 'ee/app/models/merge_requests/compliance_violation.rb'
-    - 'ee/app/models/merge_train.rb'
     - 'ee/app/models/namespaces/namespace_ban.rb'
     - 'ee/app/models/requirements_management/requirement.rb'
     - 'ee/app/models/resource_iteration_event.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 9e2061049a5..560c99e3b1d 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -499,7 +499,6 @@ RSpec/ContextWording:
     - 'ee/spec/models/member_spec.rb'
     - 'ee/spec/models/merge_request/blocking_spec.rb'
     - 'ee/spec/models/merge_request_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
     - 'ee/spec/models/note_spec.rb'
     - 'ee/spec/models/packages/package_file_spec.rb'
diff --git a/.rubocop_todo/rspec/described_class.yml b/.rubocop_todo/rspec/described_class.yml
index 94c44a144bf..99800ab8257 100644
--- a/.rubocop_todo/rspec/described_class.yml
+++ b/.rubocop_todo/rspec/described_class.yml
@@ -26,7 +26,6 @@ RSpec/DescribedClass:
     - 'ee/spec/models/issue_spec.rb'
     - 'ee/spec/models/iteration_spec.rb'
     - 'ee/spec/models/license_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
     - 'ee/spec/models/requirements_management/test_report_spec.rb'
diff --git a/.rubocop_todo/rspec/hooks_before_examples.yml b/.rubocop_todo/rspec/hooks_before_examples.yml
index a6291452db8..e161a2aba33 100644
--- a/.rubocop_todo/rspec/hooks_before_examples.yml
+++ b/.rubocop_todo/rspec/hooks_before_examples.yml
@@ -17,7 +17,6 @@ RSpec/HooksBeforeExamples:
     - 'ee/spec/lib/ee/gitlab/usage_data_counters/hll_redis_counter_spec.rb'
     - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_summary_spec.rb'
     - 'ee/spec/models/ee/merge_request_diff_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/requests/api/boards_spec.rb'
     - 'ee/spec/requests/ee/projects/deploy_tokens_controller_spec.rb'
     - 'ee/spec/services/ee/groups/deploy_tokens/create_service_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index dfcc1e48ddd..e9ede007d47 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -1254,7 +1254,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/models/merge_requests/compliance_violation_spec.rb'
     - 'ee/spec/models/merge_requests/external_status_check_spec.rb'
     - 'ee/spec/models/merge_requests/status_check_response_spec.rb'
-    - 'ee/spec/models/merge_train_spec.rb'
     - 'ee/spec/models/milestone_release_spec.rb'
     - 'ee/spec/models/milestone_spec.rb'
     - 'ee/spec/models/namespace_limit_spec.rb'