Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/feature_flags/components/form.vue

@@ -1,6 +1,6 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
-import { GlButton } from '@gitlab/ui';
+import { GlButton, GlFormTextarea } from '@gitlab/ui';
 import { memoize, cloneDeep, isNumber, uniqueId } from 'lodash';
 import { s__ } from '~/locale';
 import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue';
@@ -23,6 +23,7 @@ export default {
     GlButton,
     Strategy,
     RelatedIssuesRoot,
+    GlFormTextarea,
   },
   mixins: [featureFlagsMixin()],
   inject: {
@@ -159,24 +160,30 @@ export default {
     <fieldset>
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5 md:gl-basis-1/3">
-          <label for="feature-flag-name" class="gl-font-bold"
-            >{{ s__('FeatureFlags|Name') }} *</label
-          >
-          <input id="feature-flag-name" v-model="formName" class="form-control" />
+          <label for="feature-flag-name" class="gl-font-bold">
+            {{ s__('FeatureFlags|Name') }}
+          </label>
+          <input
+            id="feature-flag-name"
+            v-model="formName"
+            class="form-control"
+            required
+            aria-required="true"
+          />
         </div>
       </div>
-
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5 md:gl-basis-1/3">
           <label for="feature-flag-description" class="gl-font-bold">
-            {{ s__('FeatureFlags|Description') }}
+            {{ s__('FeatureFlags|Description (optional)') }}
           </label>
-          <textarea
+          <gl-form-textarea
             id="feature-flag-description"
             v-model="formDescription"
             class="form-control"
             rows="4"
-          ></textarea>
+            aria-required="false"
+          />
         </div>
       </div>
 
@@ -186,7 +193,6 @@ export default {
         :can-admin="true"
         :show-categorized-issues="false"
       />
-
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5">
           <h4>{{ s__('FeatureFlags|Strategies') }}</h4>

app/assets/javascripts/work_items/graphql/cache_utils.js

@@ -149,7 +149,13 @@ function updateNoteAwardEmojiCache(currentNotes, note, callback) {
 
 export const updateCacheAfterAddingAwardEmojiToNote = (currentNotes, note) => {
   return updateNoteAwardEmojiCache(currentNotes, note, (n, awardEmoji) => {
-    n.awardEmoji.nodes.push(awardEmoji);
+    if (
+      !n.awardEmoji.nodes.some(
+        (emoji) => emoji.name === awardEmoji.name && emoji.user.id === awardEmoji.user.id,
+      )
+    ) {
+      n.awardEmoji.nodes.push(awardEmoji);
+    }
   });
 };
 

config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml

@@ -9,6 +9,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: ActiveProjectIntegrationsMetric
+options:
+  type: pivotaltracker
 tiers:
 - free
 - premium

config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml

@@ -9,6 +9,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: ActiveGroupIntegrationsMetric
+options:
+  type: pivotaltracker
 tiers:
 - free
 - premium

db/docs/batched_background_migrations/backfill_packages_nuget_metadata_project_id.yml

@@ -6,4 +6,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167607
 milestone: '17.5'
 queued_migration_version: 20240930121136
 finalize_after: '2024-10-22'
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250318231614'

db/docs/batched_background_migrations/backfill_packages_pypi_metadata_project_id.yml

@@ -6,4 +6,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167608
 milestone: '17.5'
 queued_migration_version: 20240930121830
 finalize_after: '2024-10-22'
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250318231642'

db/migrate/20250317055520_add_allow_agent_to_request_user_to_duo_workflows_workflows.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddAllowAgentToRequestUserToDuoWorkflowsWorkflows < Gitlab::Database::Migration[2.2]
+  milestone '17.11'
+
+  def change
+    add_column :duo_workflows_workflows, :allow_agent_to_request_user, :boolean, default: true, null: false
+  end
+end

db/post_migrate/20250318231614_finalize_hk_backfill_packages_nuget_metadata_project_id.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillPackagesNugetMetadataProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.11'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillPackagesNugetMetadataProjectId',
+      table_name: :packages_nuget_metadata,
+      column_name: :package_id,
+      job_arguments: [:project_id, :packages_packages, :project_id, :package_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end

db/post_migrate/20250318231642_finalize_hk_backfill_packages_pypi_metadata_project_id.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillPackagesPypiMetadataProjectId < Gitlab::Database::Migration[2.2]
+  milestone '17.11'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillPackagesPypiMetadataProjectId',
+      table_name: :packages_pypi_metadata,
+      column_name: :package_id,
+      job_arguments: [:project_id, :packages_packages, :project_id, :package_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end

db/schema_migrations/20250317055520

@@ -0,0 +1 @@
+bdb65c5bf0e5ed59deedded20c88516914c9ac5f43c57dc95547a2122d956b2b