Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/qa-common/variables.gitlab-ci.yml

@@ -18,7 +18,7 @@ variables:
   # Helm chart ref used by test-on-cng pipeline
   GITLAB_HELM_CHART_REF: "074bb942c9c65613c2576ce418f59b8577fff37c"
   # Specific ref for cng-mirror project to trigger builds for
-  GITLAB_CNG_MIRROR_REF: "01f587c24c52e4bbf8a67135ae4f6adafa19fa2b"
+  GITLAB_CNG_MIRROR_REF: "56b6a062b05d549e0b69f79b759107e4956151eb"
   # Makes sure some of the common scripts from pipeline-common use bundler to execute commands
   RUN_WITH_BUNDLE: "true"
   # Makes sure reporting script defined in .gitlab-qa-report from pipeline-common is executed from correct folder

app/assets/javascripts/work_items/components/create_work_item.vue

@@ -36,6 +36,8 @@ import {
   I18N_WORK_ITEM_ERROR_CREATING,
   sprintfWorkItem,
   i18n,
+  NAME_TO_LOWERCASE_TEXT_MAP,
+  NAME_TO_TEXT_MAP,
   WIDGET_TYPE_ASSIGNEES,
   WIDGET_TYPE_COLOR,
   NEW_WORK_ITEM_IID,
@@ -52,8 +54,6 @@ import {
   WIDGET_TYPE_MILESTONE,
   DEFAULT_EPIC_COLORS,
   WIDGET_TYPE_HIERARCHY,
-  WORK_ITEM_TYPE_NAME_LOWERCASE_MAP,
-  WORK_ITEM_TYPE_NAME_MAP,
   WORK_ITEM_TYPE_NAME_INCIDENT,
   WORK_ITEM_TYPE_NAME_EPIC,
   WIDGET_TYPE_CUSTOM_FIELDS,
@@ -322,7 +322,7 @@ export default {
       return getDisplayReference(this.selectedProjectFullPath, this.relatedItem.reference);
     },
     relatedItemType() {
-      return WORK_ITEM_TYPE_NAME_LOWERCASE_MAP[this.relatedItem?.type];
+      return NAME_TO_LOWERCASE_TEXT_MAP[this.relatedItem?.type];
     },
     workItemAssignees() {
       return findWidget(WIDGET_TYPE_ASSIGNEES, this.workItem);
@@ -382,7 +382,7 @@ export default {
 
       return workItemTypes.map((workItemType) => ({
         value: workItemType.id,
-        text: WORK_ITEM_TYPE_NAME_MAP[workItemType.name],
+        text: NAME_TO_TEXT_MAP[workItemType.name],
       }));
     },
     selectedWorkItemType() {

app/assets/javascripts/work_items/components/create_work_item_cancel_confirmation_modal.vue

@@ -1,7 +1,7 @@
 <script>
 import { GlButton, GlModal } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
-import { WORK_ITEM_TYPE_NAME_LOWERCASE_MAP } from '../constants';
+import { NAME_TO_LOWERCASE_TEXT_MAP } from '../constants';
 
 export default {
   components: {
@@ -22,7 +22,7 @@ export default {
     cancelConfirmationText() {
       return sprintf(
         s__('WorkItem|Are you sure you want to cancel creating this %{workItemType}?'),
-        { workItemType: WORK_ITEM_TYPE_NAME_LOWERCASE_MAP[this.workItemType] },
+        { workItemType: NAME_TO_LOWERCASE_TEXT_MAP[this.workItemType] },
       );
     },
   },

app/assets/javascripts/work_items/components/create_work_item_modal.vue

@@ -5,10 +5,10 @@ import { __, s__ } from '~/locale';
 import { isMetaClick } from '~/lib/utils/common_utils';
 import { convertTypeEnumToName, newWorkItemPath } from '~/work_items/utils';
 import {
+  NAME_TO_LOWERCASE_TEXT_MAP,
   sprintfWorkItem,
   ROUTES,
   RELATED_ITEM_ID_URL_QUERY_PARAM,
-  WORK_ITEM_TYPE_NAME_LOWERCASE_MAP,
   WORK_ITEM_TYPE_ENUM_INCIDENT,
   NAME_TO_ENUM_MAP,
 } from '../constants';
@@ -136,7 +136,7 @@ export default {
       });
     },
     selectedWorkItemTypeLowercase() {
-      return WORK_ITEM_TYPE_NAME_LOWERCASE_MAP[this.selectedWorkItemTypeName];
+      return NAME_TO_LOWERCASE_TEXT_MAP[this.selectedWorkItemTypeName];
     },
     newWorkItemButtonText() {
       return this.alwaysShowWorkItemTypeSelect && this.selectedWorkItemTypeName

app/assets/javascripts/work_items/components/work_item_change_type_modal.vue

@@ -6,13 +6,13 @@ import { __, s__, sprintf } from '~/locale';
 import { findDesignsWidget, getParentGroupName, isMilestoneWidget } from '~/work_items/utils';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
+  NAME_TO_TEXT_MAP,
   ALLOWED_CONVERSION_TYPES,
   sprintfWorkItem,
   WIDGET_TYPE_DESIGNS,
   WIDGET_TYPE_HIERARCHY,
   WIDGET_TYPE_MILESTONE,
   WORK_ITEM_TYPE_NAME_EPIC,
-  WORK_ITEM_TYPE_NAME_MAP,
   WORK_ITEM_WIDGETS_NAME_MAP,
 } from '../constants';
 
@@ -151,16 +151,15 @@ export default {
       );
     },
     selectOptions() {
-      return [
-        {
-          id: null,
-          name: __('Select type'),
-        },
-        ...this.allowedConversionTypes,
-      ].map((item) => ({
-        text: item.text || item.name,
+      const selectOptions = this.allowedConversionTypes.map((item) => ({
+        text: item.text || NAME_TO_TEXT_MAP[item.name],
         value: item.id,
       }));
+      selectOptions.unshift({
+        text: __('Select type'),
+        value: null,
+      });
+      return selectOptions;
     },
     workItemsAlphaEnabled() {
       return this.glFeatures.workItemsAlpha;
@@ -372,7 +371,7 @@ export default {
             'WorkItem|%{workItemType} does not support the %{childItemType} child item types. Remove child items to change type.',
           ),
           {
-            workItemType: WORK_ITEM_TYPE_NAME_MAP[this.selectedWorkItemType.name],
+            workItemType: NAME_TO_TEXT_MAP[this.selectedWorkItemType.name],
             childItemType: this.allowedChildTypes?.[0]?.name?.toLocaleLowerCase(),
           },
         );

app/assets/javascripts/work_items/constants.js

@@ -329,7 +329,7 @@ export const ALLOWED_CONVERSION_TYPES = [
   WORK_ITEM_TYPE_NAME_ISSUE,
 ];
 
-export const WORK_ITEM_TYPE_NAME_MAP = {
+export const NAME_TO_TEXT_MAP = {
   [WORK_ITEM_TYPE_NAME_EPIC]: s__('WorkItem|Epic'),
   [WORK_ITEM_TYPE_NAME_INCIDENT]: s__('WorkItem|Incident'),
   [WORK_ITEM_TYPE_NAME_ISSUE]: s__('WorkItem|Issue'),
@@ -341,7 +341,7 @@ export const WORK_ITEM_TYPE_NAME_MAP = {
   [WORK_ITEM_TYPE_NAME_TICKET]: s__('WorkItem|Ticket'),
 };
 
-export const WORK_ITEM_TYPE_NAME_LOWERCASE_MAP = {
+export const NAME_TO_LOWERCASE_TEXT_MAP = {
   [WORK_ITEM_TYPE_NAME_EPIC]: s__('WorkItem|epic'),
   [WORK_ITEM_TYPE_NAME_INCIDENT]: s__('WorkItem|incident'),
   [WORK_ITEM_TYPE_NAME_ISSUE]: s__('WorkItem|issue'),

app/controllers/glql/base_controller.rb

@@ -14,7 +14,10 @@ class BaseController < GraphqlController
     # failures within the time window trigger throttling.
     def execute
       start_time = Gitlab::Metrics::System.monotonic_time
-      super
+
+      ::Gitlab::Database::LoadBalancing::SessionMap.use_replica_if_available do
+        super
+      end
     rescue StandardError => error
       # We catch all errors here so they are tracked by SLIs.
       # But we only increment the rate limiter failure count for ActiveRecord::QueryAborted.

app/models/namespace.rb

@@ -22,11 +22,11 @@ class Namespace < ApplicationRecord
   include SafelyChangeColumnDefault
   include Todoable
 
-  ignore_column :unlock_membership_to_ldap, remove_with: '16.7', remove_after: '2023-11-16'
+  ignore_column :unlock_membership_to_ldap, remove_with: '18.1', remove_after: '2025-05-20'
 
   cross_database_ignore_tables %w[routes redirect_routes], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424277'
 
-  ignore_column :emails_disabled, remove_with: '17.0', remove_after: '2024-04-24'
+  ignore_column :emails_disabled, remove_with: '18.1', remove_after: '2025-05-20'
 
   columns_changing_default :organization_id
 

config/feature_flags/ops/batched_migrations_health_status_autovacuum.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360331
 milestone: '15.2'
 type: ops
 group: group::database
-default_enabled: false
+default_enabled: true

config/initializers/1_settings.rb

@@ -1018,6 +1018,9 @@
   Settings.cron_jobs['delete_expired_vulnerability_exports_worker'] ||= {}
   Settings.cron_jobs['delete_expired_vulnerability_exports_worker']['cron'] ||= '0 4 * * *'
   Settings.cron_jobs['delete_expired_vulnerability_exports_worker']['job_class'] = 'Vulnerabilities::DeleteExpiredExportsWorker'
+  Settings.cron_jobs['ai_duo_workflows_fail_stuck_workflows_worker'] ||= {}
+  Settings.cron_jobs['ai_duo_workflows_fail_stuck_workflows_worker']['cron'] ||= '*/30 * * * *'
+  Settings.cron_jobs['ai_duo_workflows_fail_stuck_workflows_worker']['job_class'] ||= 'Ai::DuoWorkflows::FailStuckWorkflowsWorker'
 
   Gitlab.com do
     Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= {}