Add latest changes from gitlab-org/gitlab@master

tnir · Feb 5, 2025 · b640a98 · b640a98
1 parent e0fcac1
commit b640a98
Show file tree

Hide file tree

Showing 98 changed files with 589 additions and 182 deletions.
diff --git a/.rubocop_todo/database/avoid_using_pluck_without_limit.yml b/.rubocop_todo/database/avoid_using_pluck_without_limit.yml
@@ -120,7 +120,6 @@ Database/AvoidUsingPluckWithoutLimit:
     - 'ee/app/models/gitlab_subscriptions/add_on_purchase.rb'
     - 'ee/app/models/gitlab_subscriptions/user_add_on_assignment.rb'
     - 'ee/app/models/incident_management/oncall_rotation.rb'
-    - 'ee/app/models/instance_security_dashboard.rb'
     - 'ee/app/models/issuables_analytics.rb'
     - 'ee/app/models/iteration.rb'
     - 'ee/app/models/merge_requests/external_status_check.rb'
@@ -136,7 +135,6 @@ Database/AvoidUsingPluckWithoutLimit:
     - 'ee/app/services/approval_rules/params_filtering_service.rb'
     - 'ee/app/services/click_house/data_ingestion/ci_finished_builds_sync_service.rb'
     - 'ee/app/services/ee/groups/destroy_service.rb'
-    - 'ee/app/services/epics/update_dates_service.rb'
     - 'ee/app/services/gitlab_subscriptions/preview_billable_user_change_service.rb'
     - 'ee/app/services/security/merge_request_security_report_generation_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/default_branch_updation_check_service.rb'

diff --git a/.rubocop_todo/gitlab/feature_flag_without_actor.yml b/.rubocop_todo/gitlab/feature_flag_without_actor.yml
@@ -93,7 +93,6 @@ Gitlab/FeatureFlagWithoutActor:
     - 'ee/app/models/namespaces/free_user_cap/root_size.rb'
     - 'ee/app/policies/ee/global_policy.rb'
     - 'ee/app/policies/ee/project_policy.rb'
-    - 'ee/app/policies/ee/user_policy.rb'
     - 'ee/app/presenters/ee/merge_request_presenter.rb'
     - 'ee/app/presenters/ee/project_presenter.rb'
     - 'ee/app/services/ee/users/build_service.rb'
@@ -113,7 +112,6 @@ Gitlab/FeatureFlagWithoutActor:
     - 'ee/lib/ee/api/geo.rb'
     - 'ee/lib/ee/api/internal/base.rb'
     - 'ee/lib/ee/api/settings.rb'
-    - 'ee/lib/ee/gitlab/auth/saml/config.rb'
     - 'ee/lib/ee/gitlab/geo_git_access.rb'
     - 'ee/lib/ee/gitlab/git_access.rb'
     - 'ee/lib/gitlab/elastic/client.rb'

diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml
@@ -513,7 +513,6 @@ Gitlab/StrongMemoizeAttr:
     - 'lib/gitlab/gitaly_client/with_feature_flag_actors.rb'
     - 'lib/gitlab/github_import/client.rb'
     - 'lib/gitlab/github_import/representation/diff_notes/suggestion_formatter.rb'
-    - 'lib/gitlab/gl_repository/identifier.rb'
     - 'lib/gitlab/gpg/commit.rb'
     - 'lib/gitlab/graphql/lazy.rb'
     - 'lib/gitlab/graphql/pagination/keyset/connection.rb'

diff --git a/.rubocop_todo/layout/class_structure.yml b/.rubocop_todo/layout/class_structure.yml
@@ -67,13 +67,9 @@ Layout/ClassStructure:
     - 'app/models/gpg_key.rb'
     - 'app/models/identity.rb'
     - 'app/models/integrations/buildkite.rb'
-    - 'app/models/integrations/clickup.rb'
-    - 'app/models/integrations/confluence.rb'
     - 'app/models/integrations/datadog.rb'
-    - 'app/models/integrations/diffblue_cover.rb'
     - 'app/models/integrations/discord.rb'
     - 'app/models/integrations/drone_ci.rb'
-    - 'app/models/integrations/ewm.rb'
     - 'app/models/integrations/external_wiki.rb'
     - 'app/models/integrations/gitlab_slack_application.rb'
     - 'app/models/integrations/hangouts_chat.rb'

diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -4,7 +4,6 @@ Layout/FirstHashElementIndentation:
   Exclude:
     - 'ee/spec/lib/gitlab/ci/reports/coverage_fuzzing/report_spec.rb'
     - 'ee/spec/lib/gitlab/geo/log_cursor/lease_spec.rb'
-    - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb'
     - 'ee/spec/mailers/credentials_inventory_mailer_spec.rb'
     - 'ee/spec/mailers/emails/requirements_spec.rb'
     - 'ee/spec/models/concerns/elastic/note_spec.rb'

diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
@@ -11,7 +11,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'app/models/concerns/integrations/slack_mattermost_fields.rb'
     - 'app/models/concerns/spammable.rb'
     - 'app/models/concerns/taskable.rb'
-    - 'app/models/integrations/diffblue_cover.rb'
     - 'app/models/integrations/gitlab_slack_application.rb'
     - 'app/models/integrations/hangouts_chat.rb'
     - 'app/models/integrations/irker.rb'
@@ -349,7 +348,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'lib/bulk_imports/error.rb'
     - 'lib/feature/definition.rb'
     - 'lib/feature/shared.rb'
-    - 'lib/gitlab/audit/auditor.rb'
     - 'lib/gitlab/auth/ldap/access.rb'
     - 'lib/gitlab/auth/user_access_denied_reason.rb'
     - 'lib/gitlab/background_migration/backfill_partitioned_table.rb'

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
@@ -131,7 +131,6 @@ Layout/LineLength:
     - 'app/models/integrations/emails_on_push.rb'
     - 'app/models/integrations/harbor.rb'
     - 'app/models/integrations/jenkins.rb'
-    - 'app/models/integrations/matrix.rb'
     - 'app/models/integrations/microsoft_teams.rb'
     - 'app/models/integrations/pipelines_email.rb'
     - 'app/models/integrations/pivotaltracker.rb'
@@ -2418,7 +2417,6 @@ Layout/LineLength:
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb'
-    - 'qa/qa/specs/features/ee/browser_ui/4_verify/pipeline_subscription_with_group_owned_project_spec.rb'
     - 'qa/qa/support/ssh.rb'
     - 'qa/qa/tools/delete_subgroups.rb'
     - 'qa/qa/tools/delete_test_users.rb'

diff --git a/.rubocop_todo/lint/empty_block.yml b/.rubocop_todo/lint/empty_block.yml
@@ -39,7 +39,6 @@ Lint/EmptyBlock:
     - 'lib/api/merge_requests.rb'
     - 'lib/gitlab/alert_management/payload/base.rb'
     - 'lib/gitlab/seeder.rb'
-    - 'qa/spec/scenario/test/instance/airgapped_spec.rb'
     - 'qa/spec/specs/helpers/context_selector_spec.rb'
     - 'qa/spec/specs/helpers/feature_flag_spec.rb'
     - 'qa/spec/specs/helpers/quarantine_spec.rb'

diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml
@@ -104,7 +104,6 @@ Lint/UnusedMethodArgument:
     - 'app/models/external_issue.rb'
     - 'app/models/group.rb'
     - 'app/models/integrations/buildkite.rb'
-    - 'app/models/integrations/ewm.rb'
     - 'app/models/integrations/microsoft_teams.rb'
     - 'app/models/integrations/mock_ci.rb'
     - 'app/models/integrations/mock_monitoring.rb'

diff --git a/.rubocop_todo/migration/ensure_factory_for_table.yml b/.rubocop_todo/migration/ensure_factory_for_table.yml
@@ -9,4 +9,3 @@ Migration/EnsureFactoryForTable:
     - 'db/migrate/20240404192955_create_early_access_program_tracking_events.rb'
     - 'db/migrate/20241216070908_create_compliance_requirements_controls.rb'
     - 'db/migrate/20241227065733_create_project_control_compliance_statuses.rb'
-    - 'db/migrate/20250107082720_create_security_pipeline_execution_schedules.rb'
diff --git a/.rubocop_todo/rails/find_each.yml b/.rubocop_todo/rails/find_each.yml
@@ -5,18 +5,17 @@ Rails/FindEach:
     - 'app/finders/projects/members/effective_access_level_finder.rb'
     - 'app/services/ci/expire_pipeline_cache_service.rb'
     - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
+    - 'lib/banzai/reference_parser/base_parser.rb'
     - 'lib/gitlab/internal_events/event_definitions.rb'
+    - 'qa/qa/ee/page/group/settings/general.rb'
     - 'spec/features/admin/admin_labels_spec.rb'
     - 'spec/features/issues/user_interacts_with_awards_spec.rb'
     - 'spec/features/merge_request/user_creates_image_diff_notes_spec.rb'
     - 'spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb'
     - 'spec/features/projects/show/user_sees_git_instructions_spec.rb'
     - 'spec/features/search/user_searches_for_merge_requests_spec.rb'
     - 'spec/frontend/fixtures/analytics.rb'
+    - 'spec/lib/gitlab/database/reindexing/index_selection_spec.rb'
     - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
     - 'spec/lib/gitlab/project_template_spec.rb'
     - 'spec/lib/gitlab/sample_data_template_spec.rb'
-    - 'qa/qa/ee/page/group/settings/general.rb'
-    - 'lib/banzai/reference_parser/base_parser.rb'
-    - 'spec/lib/gitlab/database/reindexing/index_selection_spec.rb'
-    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
diff --git a/.rubocop_todo/rails/lexically_scoped_action_filter.yml b/.rubocop_todo/rails/lexically_scoped_action_filter.yml
@@ -13,7 +13,6 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/groups/milestones_controller.rb'
     - 'app/controllers/groups/settings/repository_controller.rb'
     - 'app/controllers/groups/uploads_controller.rb'
-    - 'app/controllers/groups_controller.rb'
     - 'app/controllers/import/base_controller.rb'
     - 'app/controllers/oauth/applications_controller.rb'
     - 'app/controllers/passwords_controller.rb'

diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml
@@ -1029,9 +1029,6 @@ RSpec/BeEq:
     - 'spec/lib/system_check/app/gitlab_resque_config_exists_check_spec.rb'
     - 'spec/lib/system_check/app/table_truncate_check_spec.rb'
     - 'spec/lib/uploaded_file_spec.rb'
-    - 'spec/migrations/20230929155123_migrate_disable_merge_trains_value_spec.rb'
-    - 'spec/migrations/20240419140530_set_trusted_extern_uid_to_false_for_existing_bitbucket_identities_spec.rb'
-    - 'spec/mailers/notify_spec.rb'
     - 'spec/migrations/20240508085441_re_add_redirect_routes_path_index_spec.rb'
     - 'spec/migrations/20240603152046_delete_bitbucket_identities_with_untrusted_extern_uid_spec.rb'
     - 'spec/migrations/20240627231742_update_weight_widget_definitions_spec.rb'
@@ -1266,7 +1263,6 @@ RSpec/BeEq:
     - 'spec/rubocop/migration_helpers_spec.rb'
     - 'spec/rubocop/qa_helpers_spec.rb'
     - 'spec/rubocop/todo_dir_spec.rb'
-    - 'spec/scripts/cells/application_settings_analysis_spec.rb'
     - 'spec/scripts/cells/ci_ensure_application_settings_have_definition_file_spec.rb'
     - 'spec/scripts/generate_failed_test_on_omnibus_mr_message_spec.rb'
     - 'spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb'
@@ -1309,7 +1305,6 @@ RSpec/BeEq:
     - 'spec/services/bulk_imports/relation_export_service_spec.rb'
     - 'spec/services/bulk_imports/user_contributions_export_service_spec.rb'
     - 'spec/services/captcha/captcha_verification_service_spec.rb'
-    - 'spec/services/ci/collect_pipeline_analytics_service_spec.rb'
     - 'spec/services/ci/create_downstream_pipeline_service_spec.rb'
     - 'spec/services/ci/create_pipeline_service/rules_spec.rb'
     - 'spec/services/ci/create_pipeline_service_spec.rb'
@@ -1537,5 +1532,4 @@ RSpec/BeEq:
     - 'spec/workers/projects/record_target_platforms_worker_spec.rb'
     - 'spec/workers/repository_check/batch_worker_spec.rb'
     - 'spec/workers/repository_check/single_repository_worker_spec.rb'
-    - 'spec/workers/resource_access_tokens/inactive_tokens_deletion_cron_worker_spec.rb'
     - 'spec/workers/users/unconfirmed_secondary_emails_deletion_cron_worker_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
@@ -349,8 +349,6 @@ RSpec/ContextWording:
     - 'ee/spec/lib/gitlab/geo/signed_data_spec.rb'
     - 'ee/spec/lib/gitlab/git_access_spec.rb'
     - 'ee/spec/lib/gitlab/git_access_wiki_spec.rb'
-    - 'ee/spec/lib/gitlab/gl_repository/identifier_spec.rb'
-    - 'ee/spec/lib/gitlab/gl_repository/repo_type_spec.rb'
     - 'ee/spec/lib/gitlab/graphql/aggregations/epics/epic_node_spec.rb'
     - 'ee/spec/lib/gitlab/graphql/loaders/bulk_epic_aggregate_loader_spec.rb'
     - 'ee/spec/lib/gitlab/import_export/group/relation_factory_spec.rb'
@@ -825,7 +823,6 @@ RSpec/ContextWording:
     - 'qa/qa/specs/features/browser_ui/4_verify/testing/endpoint_coverage_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/license/cloud_activation_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/license/license_spec.rb'
-    - 'qa/qa/specs/features/ee/browser_ui/2_plan/epic/epics_management_spec.rb'
     - 'qa/qa/specs/features/ee/browser_ui/2_plan/issue_boards/project_issue_boards_spec.rb'
     - 'qa/spec/git/repository_spec.rb'
     - 'qa/spec/page/element_spec.rb'

diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
@@ -223,7 +223,6 @@ RSpec/ExpectChange:
     - 'spec/models/diff_note_spec.rb'
     - 'spec/models/environment_spec.rb'
     - 'spec/models/hooks/web_hook_log_spec.rb'
-    - 'spec/models/integrations/confluence_spec.rb'
     - 'spec/models/integrations/drone_ci_spec.rb'
     - 'spec/models/label_spec.rb'
     - 'spec/models/members/last_group_owner_assigner_spec.rb'

diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -46,7 +46,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
     - 'ee/spec/helpers/ee/wiki_helper_spec.rb'
     - 'ee/spec/helpers/epics_helper_spec.rb'
-    - 'ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb'
     - 'ee/spec/helpers/gitlab_subscriptions/upcoming_reconciliation_helper_spec.rb'
     - 'ee/spec/helpers/groups/security_features_helper_spec.rb'
     - 'ee/spec/helpers/incident_management/escalation_policy_helper_spec.rb'

diff --git a/.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml b/.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml
@@ -4,7 +4,6 @@ RSpec/FactoryBot/StrategyInCallback:
     - 'ee/spec/factories/ci/builds.rb'
     - 'ee/spec/factories/ci/pipelines.rb'
     - 'ee/spec/factories/dast_scanner_profiles.rb'
-    - 'ee/spec/factories/description_version.rb'
     - 'ee/spec/factories/epic_issues.rb'
     - 'ee/spec/factories/geo_nodes.rb'
     - 'ee/spec/factories/group_members.rb'
@@ -40,7 +39,6 @@ RSpec/FactoryBot/StrategyInCallback:
     - 'spec/factories/namespaces.rb'
     - 'spec/factories/packages/dependency_links.rb'
     - 'spec/factories/packages/package_files.rb'
-    - 'spec/factories/packages/packages.rb'
     - 'spec/factories/pool_repositories.rb'
     - 'spec/factories/projects.rb'
     - 'spec/factories/releases.rb'