Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 13 deletions

diff --git a/.rubocop_todo/graphql/resource_not_available_error.yml b/.rubocop_todo/graphql/resource_not_available_error.yml
index afe976e0f69..acf90ce2f3a 100644
--- a/.rubocop_todo/graphql/resource_not_available_error.yml
+++ b/.rubocop_todo/graphql/resource_not_available_error.yml
@@ -32,7 +32,6 @@ Graphql/ResourceNotAvailableError:
     - 'app/graphql/types/container_repository_type.rb'
     - 'ee/app/graphql/mutations/ai/action.rb'
     - 'ee/app/graphql/mutations/audit_events/instance_external_audit_event_destinations/base.rb'
-    - 'ee/app/graphql/mutations/ci/ai/generate_config.rb'
     - 'ee/app/graphql/mutations/issues/set_escalation_policy.rb'
     - 'ee/app/graphql/mutations/projects/set_locked.rb'
     - 'ee/app/graphql/resolvers/incident_management/oncall_shifts_resolver.rb'
diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml
index d35df4df983..5f5f2c52a02 100644
--- a/.rubocop_todo/rspec/before_all_role_assignment.yml
+++ b/.rubocop_todo/rspec/before_all_role_assignment.yml
@@ -178,7 +178,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/graphql/mutations/boards/epic_boards/epic_move_list_spec.rb'
     - 'ee/spec/graphql/mutations/boards/epic_boards/update_spec.rb'
     - 'ee/spec/graphql/mutations/boards/update_epic_user_preferences_spec.rb'
-    - 'ee/spec/graphql/mutations/ci/ai/generate_config_spec.rb'
     - 'ee/spec/graphql/mutations/compliance_management/frameworks/create_spec.rb'
     - 'ee/spec/graphql/mutations/compliance_management/frameworks/destroy_spec.rb'
     - 'ee/spec/graphql/mutations/compliance_management/frameworks/update_spec.rb'
@@ -311,7 +310,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/lib/gitlab/llm/chain/tools/summarize_comments/executor_spec.rb'
     - 'ee/spec/lib/gitlab/quick_actions/users_extractor_spec.rb'
     - 'ee/spec/lib/gitlab/reference_extractor_spec.rb'
-    - 'ee/spec/models/ai/project/conversations_spec.rb'
     - 'ee/spec/models/analytics/cycle_analytics/group_level_spec.rb'
     - 'ee/spec/models/dast/profile_schedule_spec.rb'
     - 'ee/spec/models/ee/award_emoji_spec.rb'
@@ -329,7 +327,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/vulnerabilities/projects_grade_spec.rb'
     - 'ee/spec/policies/app_sec/fuzzing/coverage/corpus_policy_spec.rb'
-    - 'ee/spec/policies/ci/editor/ai_conversation/message_policy_spec.rb'
     - 'ee/spec/policies/ci/job_artifact_policy_spec.rb'
     - 'ee/spec/policies/compliance_management/framework_policy_spec.rb'
     - 'ee/spec/policies/dependencies/dependency_list_export_policy_spec.rb'
@@ -604,7 +601,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/services/ci/create_pipeline_service/compliance_spec.rb'
     - 'ee/spec/services/ci/create_pipeline_service/needs_spec.rb'
     - 'ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb'
-    - 'ee/spec/services/ci/llm/async_generate_config_service_spec.rb'
     - 'ee/spec/services/ci/pipeline_trigger_service_spec.rb'
     - 'ee/spec/services/ci/process_pipeline_service_spec.rb'
     - 'ee/spec/services/ci/retry_pipeline_service_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml b/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
index 0bbf59cc244..e896efc1c3d 100644
--- a/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
+++ b/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
@@ -8,7 +8,6 @@ RSpec/FactoryBot/ExcessiveCreateList:
     - 'ee/spec/models/license_spec.rb'
     - 'ee/spec/models/package_metadata/advisory_spec.rb'
     - 'ee/spec/requests/projects/merge_requests_controller_spec.rb'
-    - 'ee/spec/services/ci/llm/generate_config_service_spec.rb'
     - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
     - 'spec/controllers/autocomplete_controller_spec.rb'
     - 'spec/controllers/explore/projects_controller_spec.rb'
diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index 752c32b9d6a..69a4316468e 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -546,7 +546,6 @@ RSpec/NamedSubject:
     - 'ee/spec/mailers/license_mailer_spec.rb'
     - 'ee/spec/mailers/notify_spec.rb'
     - 'ee/spec/models/ai/job_failure_analysis_spec.rb'
-    - 'ee/spec/models/ai/project/conversations_spec.rb'
     - 'ee/spec/models/allowed_email_domain_spec.rb'
     - 'ee/spec/models/analytics/cycle_analytics/group_level_spec.rb'
     - 'ee/spec/models/analytics/forecasting/deployment_frequency_forecast_spec.rb'
@@ -570,7 +569,6 @@ RSpec/NamedSubject:
     - 'ee/spec/models/ci/bridge_spec.rb'
     - 'ee/spec/models/ci/build_spec.rb'
     - 'ee/spec/models/ci/daily_build_group_report_result_spec.rb'
-    - 'ee/spec/models/ci/editor/ai_conversation/message_spec.rb'
     - 'ee/spec/models/ci/minutes/cost_setting_spec.rb'
     - 'ee/spec/models/ci/minutes/namespace_monthly_usage_spec.rb'
     - 'ee/spec/models/ci/minutes/project_monthly_usage_spec.rb'
@@ -945,8 +943,6 @@ RSpec/NamedSubject:
     - 'ee/spec/services/ci/create_pipeline_service/dast_configuration_spec.rb'
     - 'ee/spec/services/ci/delete_project_subscription_service_spec.rb'
     - 'ee/spec/services/ci/external_pull_requests/process_github_event_service_spec.rb'
-    - 'ee/spec/services/ci/llm/async_generate_config_service_spec.rb'
-    - 'ee/spec/services/ci/llm/generate_config_service_spec.rb'
     - 'ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb'
     - 'ee/spec/services/ci/minutes/reset_usage_service_spec.rb'
     - 'ee/spec/services/ci/minutes/track_live_consumption_service_spec.rb'
@@ -1194,7 +1190,6 @@ RSpec/NamedSubject:
     - 'ee/spec/workers/audit_events/audit_event_streaming_worker_spec.rb'
     - 'ee/spec/workers/audit_events/user_impersonation_event_create_worker_spec.rb'
     - 'ee/spec/workers/ci/initial_pipeline_process_worker_spec.rb'
-    - 'ee/spec/workers/ci/llm/generate_config_worker_spec.rb'
     - 'ee/spec/workers/ci/minutes/refresh_cached_data_worker_spec.rb'
     - 'ee/spec/workers/ci/minutes/update_project_and_namespace_usage_worker_spec.rb'
     - 'ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 644c6fa726b..cc101f02cf4 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -1332,7 +1332,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/graphql/types/admin/cloud_licenses/subscription_future_entry_type.rb'
     - 'ee/app/graphql/types/ai/message_extras_type.rb'
     - 'ee/app/graphql/types/ai/message_type.rb'
-    - 'ee/app/graphql/types/ai/project_conversations_type.rb'
     - 'ee/app/graphql/types/ai/prompt/ai_prompt_type.rb'
     - 'ee/app/graphql/types/ai/prompt/explain_vulnerability_prompt_type.rb'
     - 'ee/app/graphql/types/ai/prompt/explain_vulnerability_prompt_type/presubmission_check_results_type.rb'
@@ -1719,7 +1718,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/workers/merge_request_reset_approvals_worker.rb'
     - 'ee/app/workers/new_epic_worker.rb'
     - 'ee/app/workers/okrs/checkin_reminder_emails_cron_worker.rb'
-    - 'ee/app/workers/open_ai/clear_conversations_worker.rb'
     - 'ee/app/workers/package_metadata/advisories_sync_worker.rb'
     - 'ee/app/workers/package_metadata/licenses_sync_worker.rb'
     - 'ee/app/workers/personal_access_tokens/instance/policy_worker.rb'