Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -3736,11 +3736,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/workers/ldap_sync_worker.rb'
     - 'ee/app/workers/licenses/reset_submit_license_usage_data_banner_worker.rb'
     - 'ee/app/workers/llm/completion_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/cleanup_previous_versions_records_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_db_embeddings_per_doc_file_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_embeddings_records_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/embeddings_worker_context.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/set_embeddings_on_the_record_worker.rb'
     - 'ee/app/workers/llm/namespace_access_cache_reset_worker.rb'
     - 'ee/app/workers/llm/vertex_ai_access_token_refresh_worker.rb'
     - 'ee/app/workers/members_destroyer/clean_up_group_protected_branch_rules_worker.rb'

.rubocop_todo/gitlab/feature_flag_without_actor.yml

@@ -139,10 +139,6 @@ Gitlab/FeatureFlagWithoutActor:
     - 'ee/app/views/projects/settings/merge_requests/_merge_trains_settings.html.haml'
     - 'ee/app/workers/elastic/migration_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/add_on_purchases/schedule_bulk_refresh_user_assignments_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/cleanup_previous_versions_records_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_db_embeddings_per_doc_file_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_embeddings_records_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/set_embeddings_on_the_record_worker.rb'
     - 'ee/app/workers/llm/vertex_ai_access_token_refresh_worker.rb'
     - 'ee/app/workers/search/index_curation_worker.rb'
     - 'ee/app/workers/search/zoekt/scheduling_worker.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1570,8 +1570,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/workers/ldap_group_sync_worker.rb'
     - 'ee/app/workers/ldap_sync_worker.rb'
     - 'ee/app/workers/licenses/reset_submit_license_usage_data_banner_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/cleanup_previous_versions_records_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_db_embeddings_per_doc_file_worker.rb'
     - 'ee/app/workers/members_destroyer/clean_up_group_protected_branch_rules_worker.rb'
     - 'ee/app/workers/merge_request_reset_approvals_worker.rb'
     - 'ee/app/workers/new_epic_worker.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-412263801bb4a37fdf09aed95269342369dc74a7
+47c3c8bc2d5a93e83eee6b250a06e4c39d9c929c

GITLAB_KAS_VERSION

@@ -1 +1 @@
-v17.2.0-rc1
+v17.2.0-rc2

app/assets/javascripts/boards/components/board_content_sidebar.vue

@@ -164,7 +164,7 @@ export default {
       return referencePath.slice(0, referencePath.indexOf('#'));
     },
     showWorkItemEpics() {
-      return this.glFeatures.displayWorkItemEpicIssueSidebar;
+      return this.glFeatures.workItemEpics;
     },
     showEpicSidebarDropdownWidget() {
       return this.epicFeatureAvailable && !this.isIncidentSidebar && this.activeBoardIssuable.id;

app/assets/javascripts/ci/pipeline_details/dag/dag.vue

@@ -99,7 +99,7 @@ export default {
   errorTexts: {
     [LOAD_FAILURE]: __('We are currently unable to fetch data for this graph.'),
     [PARSE_FAILURE]: __('There was an error parsing the data for this graph.'),
-    [UNSUPPORTED_DATA]: __('DAG visualization requires at least 3 dependent jobs.'),
+    [UNSUPPORTED_DATA]: __('Needs visualization requires at least 3 dependent jobs.'),
     [DEFAULT]: __('An unknown error occurred while loading this graph.'),
   },
   emptyStateTexts: {
@@ -108,9 +108,9 @@ export default {
       'Using the %{codeStart}needs%{codeEnd} keyword makes jobs run before their stage is reached. Jobs run as soon as their %{codeStart}needs%{codeEnd} relationships are met, which speeds up your pipelines.',
     ),
     secondDescription: __(
-      "If you add %{codeStart}needs%{codeEnd} to jobs in your pipeline you'll be able to view the %{codeStart}needs%{codeEnd} relationships between jobs in this tab as a %{linkStart}Directed Acyclic Graph (DAG)%{linkEnd}.",
+      "If you add %{codeStart}needs%{codeEnd} to jobs in your pipeline you'll be able to view the %{codeStart}needs%{codeEnd} dependencies between jobs in this tab.",
     ),
-    button: __('Learn more about Needs relationships'),
+    button: __('Learn more about needs dependencies'),
   },
   computed: {
     failure() {

app/controllers/groups/boards_controller.rb

@@ -7,7 +7,6 @@ class Groups::BoardsController < Groups::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:board_multi_select, group)
-    push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, group)
   end
 
   feature_category :team_planning

app/controllers/projects/boards_controller.rb

@@ -7,7 +7,6 @@ class Projects::BoardsController < Projects::ApplicationController
   before_action :check_issues_available!
   before_action do
     push_frontend_feature_flag(:board_multi_select, project)
-    push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
   end
 
   feature_category :team_planning

app/controllers/projects/issues_controller.rb

@@ -48,7 +48,6 @@ class Projects::IssuesController < Projects::ApplicationController
     push_frontend_feature_flag(:issues_grid_view)
     push_frontend_feature_flag(:service_desk_ticket)
     push_frontend_feature_flag(:issues_list_drawer, project)
-    push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
     push_frontend_feature_flag(:notifications_todos_buttons, current_user)
   end
 
@@ -66,7 +65,6 @@ class Projects::IssuesController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items_beta, project&.work_items_beta_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_alpha, project&.work_items_alpha_feature_flag_enabled?)
     push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
-    push_frontend_feature_flag(:display_work_item_epic_issue_sidebar, project)
     push_frontend_feature_flag(:namespace_level_work_items, project&.group)
   end
 

app/graphql/mutations/issues/set_crm_contacts.rb

@@ -38,7 +38,7 @@ def resolve(project_path:, iid:, contact_ids:, operation_mode: Types::MutationOp
                            :replace_ids
                          end
 
-        response = ::Issues::SetCrmContactsService.new(project: project, current_user: current_user, params: { attribute_name => contact_ids })
+        response = ::Issues::SetCrmContactsService.new(container: project, current_user: current_user, params: { attribute_name => contact_ids })
           .execute(issue)
 
         {

app/helpers/plan_limits_helper.rb

@@ -14,7 +14,7 @@ def plan_limit_setting_description(limit_name)
     when :ci_pipeline_schedules
       s_('AdminSettings|Maximum number of pipeline schedules')
     when :ci_needs_size_limit
-      s_('AdminSettings|Maximum number of DAG dependencies that a job can have')
+      s_('AdminSettings|Maximum number of needs dependencies that a job can have')
     when :ci_registered_group_runners
       s_('AdminSettings|Maximum number of runners registered per group')
     when :ci_registered_project_runners

app/services/base_container_service.rb

@@ -40,6 +40,10 @@ def project_group
   end
   strong_memoize_attr :project_group
 
+  def root_ancestor
+    project_group&.root_ancestor || group&.root_ancestor
+  end
+
   private
 
   def handle_container_type(container)

app/services/issuable_base_service.rb

@@ -301,7 +301,7 @@ def create(issuable, skip_system_notes: false)
   def set_crm_contacts(issuable, add_crm_contact_emails, remove_crm_contact_emails = [])
     return unless add_crm_contact_emails.present? || remove_crm_contact_emails.present?
 
-    ::Issues::SetCrmContactsService.new(project: project, current_user: current_user, params: { add_emails: add_crm_contact_emails, remove_emails: remove_crm_contact_emails }).execute(issuable)
+    ::Issues::SetCrmContactsService.new(container: project, current_user: current_user, params: { add_emails: add_crm_contact_emails, remove_emails: remove_crm_contact_emails }).execute(issuable)
   end
 
   def before_create(issuable)

app/services/issues/set_crm_contacts_service.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Issues
-  class SetCrmContactsService < ::BaseProjectService
+  class SetCrmContactsService < ::BaseContainerService
     MAX_ADDITIONAL_CONTACTS = 6
 
     # Replacing contacts by email is not currently supported
@@ -52,7 +52,7 @@ def add
     end
 
     def add_by_email
-      contact_ids = ::CustomerRelations::Contact.find_ids_by_emails(project_group.root_ancestor, emails(:add_emails))
+      contact_ids = ::CustomerRelations::Contact.find_ids_by_emails(container.root_ancestor, emails(:add_emails))
       add_by_id(contact_ids)
     end
 

app/views/admin/application_settings/_ci_cd.html.haml

@@ -114,7 +114,7 @@
                 .form-group
                   = f.label :ci_needs_size_limit, plan_limit_setting_description(:ci_needs_size_limit)
                   = f.number_field :ci_needs_size_limit, class: 'form-control gl-form-input'
-                  .form-text.text-muted= s_('AdminSettings|This limit cannot be disabled. Set to 0 to block all DAG dependencies.')
+                  .form-text.text-muted= s_('AdminSettings|This limit cannot be disabled. Set to 0 to block all job (needs) dependencies.')
                 .form-group
                   = f.label :ci_registered_group_runners, plan_limit_setting_description(:ci_registered_group_runners)
                   = f.number_field :ci_registered_group_runners, class: 'form-control gl-form-input'

app/workers/gitlab/bitbucket_import/stage/import_repository_worker.rb

@@ -13,11 +13,7 @@ def import(project)
 
           importer.execute
 
-          if Feature.enabled?(:bitbucket_cloud_convert_mentions_to_users, project.creator)
-            return ImportUsersWorker.perform_async(project.id)
-          end
-
-          ImportPullRequestsWorker.perform_async(project.id)
+          ImportUsersWorker.perform_async(project.id)
         end
 
         def importer_class

config/feature_flags/development/display_work_item_epic_issue_sidebar.yml

@@ -824,12 +824,6 @@
   Settings.cron_jobs['sync_service_token_worker'] ||= {}
   Settings.cron_jobs['sync_service_token_worker']['cron'] ||= "#{rand(60)} #{rand(5..6)} * * * UTC"
   Settings.cron_jobs['sync_service_token_worker']['job_class'] = '::CloudConnector::SyncServiceTokenWorker'
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_create_embeddings_records_worker'] ||= {}
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_create_embeddings_records_worker']['cron'] ||= '0 5 * * 1,2,3,4,5'
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_create_embeddings_records_worker']['job_class'] ||= 'Llm::Embedding::GitlabDocumentation::CreateEmbeddingsRecordsWorker'
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker'] ||= {}
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker']['cron'] ||= '0 0 * * *'
-  Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker']['job_class'] ||= 'Llm::Embedding::GitlabDocumentation::CleanupPreviousVersionsRecordsWorker'
   Settings.cron_jobs['users_create_statistics_worker'] ||= {}
   Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
   Settings.cron_jobs['users_create_statistics_worker']['job_class'] = 'Users::CreateStatisticsWorker'

config/feature_flags/gitlab_com_derisk/bitbucket_cloud_convert_mentions_to_users.yml

@@ -463,10 +463,6 @@
   - 2
 - - llm_completion
   - 1
-- - llm_embedding_gitlab_documentation_create_db_embeddings_per_doc_file
-  - 1
-- - llm_embedding_gitlab_documentation_set_embeddings_on_the_record
-  - 1
 - - llm_namespace_access_cache_reset
   - 1
 - - llm_vertex_ai_access_token_refresh

config/initializers/1_settings.rb

@@ -5,6 +5,8 @@ PIPELINE_CHANGES_MESSAGE = <<~MSG
 
 This merge request contains changes to the pipeline configuration for the GitLab project.
 
+Please run `spec/dot_gitlab_ci/job_dependency_spec.rb` locally to confirm that the configuration is valid. This test can be slow and is quarantined in CI for now.
+
 Please consider the effect of the changes in this merge request on the following:
 - Effects on different [pipeline types](https://docs.gitlab.com/ee/development/pipelines/index.html#pipelines-types-for-merge-requests)
 - Effects on non-canonical projects:

config/sidekiq_queues.yml

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class CleanupBigintConversionsForPCiBuildsAttempt2 < Gitlab::Database::Migration[2.2]
+  include Gitlab::Database::SchemaHelpers
+
+  milestone '17.3'
+
+  enable_lock_retries!
+
+  TABLE_NAME = :p_ci_builds
+  TRIGGER_NAME = :trigger_10ee1357e825
+  COLUMN_NAMES = %i[
+    auto_canceled_by_id
+    commit_id
+    erased_by_id
+    project_id
+    runner_id
+    trigger_request_id
+    upstream_pipeline_id
+    user_id
+  ]
+
+  def up
+    return unless trigger_and_integer_columns_exists?
+
+    lock_tables(TABLE_NAME, mode: :access_exclusive, only: true)
+    lock_tables(TABLE_NAME, mode: :access_exclusive)
+    cleanup_conversion_of_integer_to_bigint(TABLE_NAME, COLUMN_NAMES)
+  end
+
+  def down
+    return if trigger_and_integer_columns_exists?
+
+    restore_conversion_of_integer_to_bigint(TABLE_NAME, COLUMN_NAMES)
+  end
+
+  private
+
+  def trigger_and_integer_columns_exists?
+    trigger_exists?(TABLE_NAME, TRIGGER_NAME) && \
+      COLUMN_NAMES.all? { |name| column_exists?(TABLE_NAME, "#{name}_convert_to_bigint") }
+  end
+end

danger/pipeline/Dangerfile

@@ -0,0 +1 @@
+3b33d9061546cc040f69ff79fbe381cb4578ef134143281ee85e2547933f551e

db/post_migrate/20240709014310_cleanup_bigint_conversions_for_p_ci_builds_attempt2.rb

@@ -841,22 +841,6 @@ RETURN NEW;
 END
 $$;
 
-CREATE FUNCTION trigger_10ee1357e825() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  NEW."auto_canceled_by_id_convert_to_bigint" := NEW."auto_canceled_by_id";
-  NEW."commit_id_convert_to_bigint" := NEW."commit_id";
-  NEW."erased_by_id_convert_to_bigint" := NEW."erased_by_id";
-  NEW."project_id_convert_to_bigint" := NEW."project_id";
-  NEW."runner_id_convert_to_bigint" := NEW."runner_id";
-  NEW."trigger_request_id_convert_to_bigint" := NEW."trigger_request_id";
-  NEW."upstream_pipeline_id_convert_to_bigint" := NEW."upstream_pipeline_id";
-  NEW."user_id_convert_to_bigint" := NEW."user_id";
-  RETURN NEW;
-END;
-$$;
-
 CREATE FUNCTION trigger_13d4aa8fe3dd() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -2172,23 +2156,17 @@ CREATE TABLE p_ci_builds (
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     started_at timestamp without time zone,
-    runner_id_convert_to_bigint integer,
     coverage double precision,
-    commit_id_convert_to_bigint integer,
     name character varying,
     options text,
     allow_failure boolean DEFAULT false NOT NULL,
     stage character varying,
-    trigger_request_id_convert_to_bigint integer,
     stage_idx integer,
     tag boolean,
     ref character varying,
-    user_id_convert_to_bigint integer,
     type character varying,
     target_url character varying,
     description character varying,
-    project_id_convert_to_bigint integer,
-    erased_by_id_convert_to_bigint integer,
     erased_at timestamp without time zone,
     artifacts_expire_at timestamp without time zone,
     environment character varying,
@@ -2197,13 +2175,11 @@ CREATE TABLE p_ci_builds (
     queued_at timestamp without time zone,
     lock_version integer DEFAULT 0,
     coverage_regex character varying,
-    auto_canceled_by_id_convert_to_bigint integer,
     retried boolean,
     protected boolean,
     failure_reason integer,
     scheduled_at timestamp with time zone,
     token_encrypted character varying,
-    upstream_pipeline_id_convert_to_bigint integer,
     resource_group_id bigint,
     waiting_for_resource_at timestamp with time zone,
     processed boolean,
@@ -7497,23 +7473,17 @@ CREATE TABLE ci_builds (
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     started_at timestamp without time zone,
-    runner_id_convert_to_bigint integer,
     coverage double precision,
-    commit_id_convert_to_bigint integer,
     name character varying,
     options text,
     allow_failure boolean DEFAULT false NOT NULL,
     stage character varying,
-    trigger_request_id_convert_to_bigint integer,
     stage_idx integer,
     tag boolean,
     ref character varying,
-    user_id_convert_to_bigint integer,
     type character varying,
     target_url character varying,
     description character varying,
-    project_id_convert_to_bigint integer,
-    erased_by_id_convert_to_bigint integer,
     erased_at timestamp without time zone,
     artifacts_expire_at timestamp without time zone,
     environment character varying,
@@ -7522,13 +7492,11 @@ CREATE TABLE ci_builds (
     queued_at timestamp without time zone,
     lock_version integer DEFAULT 0,
     coverage_regex character varying,
-    auto_canceled_by_id_convert_to_bigint integer,
     retried boolean,
     protected boolean,
     failure_reason integer,
     scheduled_at timestamp with time zone,
     token_encrypted character varying,
-    upstream_pipeline_id_convert_to_bigint integer,
     resource_group_id bigint,
     waiting_for_resource_at timestamp with time zone,
     processed boolean,
@@ -31776,8 +31744,6 @@ CREATE TRIGGER trigger_0da002390fdc BEFORE INSERT OR UPDATE ON operations_featur
 
 CREATE TRIGGER trigger_0e13f214e504 BEFORE INSERT OR UPDATE ON merge_request_assignment_events FOR EACH ROW EXECUTE FUNCTION trigger_0e13f214e504();
 
-CREATE TRIGGER trigger_10ee1357e825 BEFORE INSERT OR UPDATE ON p_ci_builds FOR EACH ROW EXECUTE FUNCTION trigger_10ee1357e825();
-
 CREATE TRIGGER trigger_13d4aa8fe3dd BEFORE INSERT OR UPDATE ON draft_notes FOR EACH ROW EXECUTE FUNCTION trigger_13d4aa8fe3dd();
 
 CREATE TRIGGER trigger_174b23fa3dfb BEFORE INSERT OR UPDATE ON approval_project_rules_users FOR EACH ROW EXECUTE FUNCTION trigger_174b23fa3dfb();

db/schema_migrations/20240709014310

@@ -53,7 +53,6 @@ exceptions:
   - CVS
   - CVSS
   - CWE
-  - DAG
   - DAST
   - DDL
   - DHCP