From db3d5dbc020c64ccfbc6fd58b4529cc47314f009 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Jun 2025 06:07:22 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 GITALY_SERVER_VERSION                         |  2 +-
 .../components/container_registry_usage.vue   |  2 +-
 .../shared/work_item_link_child_contents.vue  | 16 +++++++++++-
 config/events/register_agent_at_kas.yml       |  2 +-
 config/events/register_agentw_at_kas.yml      | 25 +++++++++++++++++++
 ...project_id_from_register_agentw_at_kas.yml | 23 +++++++++++++++++
 .../count_total_register_agentw_at_kas.yml    | 22 ++++++++++++++++
 ..._packages_composer_metadata_project_id.yml |  2 +-
 ...l_packages_composer_metadata_project_id.rb | 20 +++++++++++++++
 db/schema_migrations/20250611194107           |  1 +
 scripts/migration_schema_validator.rb         |  6 ++---
 .../container_registry_usage_spec.js          |  2 +-
 .../work_item_link_child_contents_spec.js     | 20 +++++++++++----
 13 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 config/events/register_agentw_at_kas.yml
 create mode 100644 config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml
 create mode 100644 config/metrics/counts_all/count_total_register_agentw_at_kas.yml
 create mode 100644 db/post_migrate/20250611194107_finalize_backfill_packages_composer_metadata_project_id.rb
 create mode 100644 db/schema_migrations/20250611194107

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 6f1f775f03b..2f835acb252 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-4f0652cb7aee4addb41841dc6daf253b209bae7d
+707429494a96d985d94e0b10da1c1c5519fa5fb6
diff --git a/app/assets/javascripts/usage_quotas/storage/namespace/components/container_registry_usage.vue b/app/assets/javascripts/usage_quotas/storage/namespace/components/container_registry_usage.vue
index c381151fb53..2fb32535f05 100644
--- a/app/assets/javascripts/usage_quotas/storage/namespace/components/container_registry_usage.vue
+++ b/app/assets/javascripts/usage_quotas/storage/namespace/components/container_registry_usage.vue
@@ -58,7 +58,7 @@ export default {
       {{ $options.i18n.storageUsed }}
     </template>
     <template #right-secondary-text>
-      <number-to-human-size :value="containerRegistrySize" data-testid="total-size-section" />
+      <number-to-human-size :value="containerRegistrySize" data-testid="container-registry-size" />
       <storage-type-warning v-if="containerRegistrySizeIsEstimated">
         {{ $options.i18n.estimatedWarningTooltip }}
         <help-page-link
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
index ff666db683e..ad5baa20f74 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
@@ -18,7 +18,12 @@ import WorkItemLinkChildMetadata from 'ee_else_ce/work_items/components/shared/w
 import RichTimestampTooltip from '../rich_timestamp_tooltip.vue';
 import WorkItemTypeIcon from '../work_item_type_icon.vue';
 import WorkItemStateBadge from '../work_item_state_badge.vue';
-import { canRouterNav, findLinkedItemsWidget, getDisplayReference } from '../../utils';
+import {
+  canRouterNav,
+  findLinkedItemsWidget,
+  findStatusWidget,
+  getDisplayReference,
+} from '../../utils';
 import {
   STATE_OPEN,
   WIDGET_TYPE_ASSIGNEES,
@@ -143,6 +148,14 @@ export default {
     displayLabels() {
       return this.showLabels && this.labels.length;
     },
+    workItemStatus() {
+      return findStatusWidget(this.childItem)?.status?.name;
+    },
+    showState() {
+      return this.glFeatures.workItemStatusFeatureFlag
+        ? !this.workItemStatus || !this.isChildItemOpen
+        : true;
+    },
     displayReference() {
       return getDisplayReference(this.workItemFullPath, this.childItem.reference);
     },
@@ -282,6 +295,7 @@ export default {
           />
           <slot name="child-contents"></slot>
           <span
+            v-if="showState"
             :id="`statusIcon-${childItem.id}`"
             class="gl-cursor-help"
             data-testid="item-status-icon"
diff --git a/config/events/register_agent_at_kas.yml b/config/events/register_agent_at_kas.yml
index 5c9eabfaa7b..8be4db6b364 100644
--- a/config/events/register_agent_at_kas.yml
+++ b/config/events/register_agent_at_kas.yml
@@ -1,5 +1,5 @@
 ---
-description: Agents send the register request to KAS periodically (default every 5 min). KAS registers the agent to keep track of connected agents.
+description: Gitlab Agent for Kubernetes (agentk) registered at KAS
 internal_events: true
 action: register_agent_at_kas
 identifiers:
diff --git a/config/events/register_agentw_at_kas.yml b/config/events/register_agentw_at_kas.yml
new file mode 100644
index 00000000000..5148273868d
--- /dev/null
+++ b/config/events/register_agentw_at_kas.yml
@@ -0,0 +1,25 @@
+---
+description: GitLab Agent for Workspace (agentw) registered at KAS
+internal_events: true
+status: active
+action: register_agentw_at_kas
+identifiers:
+- project
+- namespace
+- user
+additional_properties:
+  label:
+    description: GitLab Agent version
+  property:
+    description: CPU architecture of the agent, e.g. x86_64
+  value:
+    description: GitLab Agent unique id
+product_group: environments
+product_categories:
+- continuous_delivery
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml b/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml
new file mode 100644
index 00000000000..21505e2eb3d
--- /dev/null
+++ b/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.count_distinct_project_id_from_register_agentw_at_kas
+description: Count of unique projects that GitLab Agent for Workspace (agentw) was registered at KAS
+product_group: environments
+product_categories:
+- continuous_delivery
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+time_frame:
+- 28d
+- 7d
+data_source: internal_events
+data_category: optional
+tiers:
+- free
+- premium
+- ultimate
+events:
+- name: register_agentw_at_kas
+  unique: project.id
diff --git a/config/metrics/counts_all/count_total_register_agentw_at_kas.yml b/config/metrics/counts_all/count_total_register_agentw_at_kas.yml
new file mode 100644
index 00000000000..301004c1c67
--- /dev/null
+++ b/config/metrics/counts_all/count_total_register_agentw_at_kas.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.count_total_register_agentw_at_kas
+description: Count of GitLab Agent for Workspace (agentw) registered at KAS
+product_group: environments
+product_categories:
+- continuous_delivery
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+time_frame:
+- 28d
+- 7d
+data_source: internal_events
+data_category: optional
+tiers:
+- free
+- premium
+- ultimate
+events:
+- name: register_agentw_at_kas
diff --git a/db/docs/batched_background_migrations/backfill_packages_composer_metadata_project_id.yml b/db/docs/batched_background_migrations/backfill_packages_composer_metadata_project_id.yml
index 7cb8f560d31..1f5460384a5 100644
--- a/db/docs/batched_background_migrations/backfill_packages_composer_metadata_project_id.yml
+++ b/db/docs/batched_background_migrations/backfill_packages_composer_metadata_project_id.yml
@@ -6,4 +6,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167444
 milestone: '17.5'
 queued_migration_version: 20240927123742
 finalize_after: '2024-10-22'
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250611194107'
diff --git a/db/post_migrate/20250611194107_finalize_backfill_packages_composer_metadata_project_id.rb b/db/post_migrate/20250611194107_finalize_backfill_packages_composer_metadata_project_id.rb
new file mode 100644
index 00000000000..7cd9e847661
--- /dev/null
+++ b/db/post_migrate/20250611194107_finalize_backfill_packages_composer_metadata_project_id.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillPackagesComposerMetadataProjectId < Gitlab::Database::Migration[2.3]
+  milestone '18.2'
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillPackagesComposerMetadataProjectId',
+      table_name: :packages_composer_metadata,
+      column_name: :package_id,
+      job_arguments: [:project_id, :packages_packages, :project_id, :package_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250611194107 b/db/schema_migrations/20250611194107
new file mode 100644
index 00000000000..c706d2d743f
--- /dev/null
+++ b/db/schema_migrations/20250611194107
@@ -0,0 +1 @@
+fc4f1c0df8306fbd0e711e2e7769a64e9e147795cc05911c238164c0af77d2a8
\ No newline at end of file
diff --git a/scripts/migration_schema_validator.rb b/scripts/migration_schema_validator.rb
index ad607a59ac5..dab83565272 100644
--- a/scripts/migration_schema_validator.rb
+++ b/scripts/migration_schema_validator.rb
@@ -43,8 +43,10 @@ class MigrationSchemaValidator
       return
     end
 
-    # validate_ignore_columns! should never be skipped, the ignore_column directive must always be present
+    # only check allowed to be skipped is validate_schema_on_rollback!
     validate_ignore_columns!
+    validate_schema_on_migrate!
+    validate_schema_version_files!
 
     if skip_validation?
       puts "\e[32m Label #{SKIP_VALIDATION_LABEL} is present, skipping schema validation\e[0m"
@@ -52,8 +54,6 @@ class MigrationSchemaValidator
     end
 
     validate_schema_on_rollback!
-    validate_schema_on_migrate!
-    validate_schema_version_files!
   end
 
   private
diff --git a/spec/frontend/usage_quotas/storage/namespace/components/container_registry_usage_spec.js b/spec/frontend/usage_quotas/storage/namespace/components/container_registry_usage_spec.js
index a98b1a6352c..4cdfc1adee3 100644
--- a/spec/frontend/usage_quotas/storage/namespace/components/container_registry_usage_spec.js
+++ b/spec/frontend/usage_quotas/storage/namespace/components/container_registry_usage_spec.js
@@ -11,7 +11,7 @@ describe('Container registry usage component', () => {
     containerRegistrySizeIsEstimated: false,
   };
 
-  const findTotalSizeSection = () => wrapper.findByTestId('total-size-section');
+  const findTotalSizeSection = () => wrapper.findByTestId('container-registry-size');
   const findWarningIcon = () => wrapper.findComponent(StorageTypeWarning);
 
   const createComponent = (props) => {
diff --git a/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js b/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
index 82124489ea4..4b3761909dd 100644
--- a/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
+++ b/spec/frontend/work_items/components/shared/work_item_link_child_contents_spec.js
@@ -59,6 +59,7 @@ describe('WorkItemLinkChildContents', () => {
     isGroup = false,
     getRoutesMock = defaultGetRoutesMock,
     contextualViewEnabled = false,
+    workItemStatusFeatureFlag = false,
   } = {}) => {
     wrapper = shallowMountExtended(WorkItemLinkChildContents, {
       propsData: {
@@ -70,6 +71,9 @@ describe('WorkItemLinkChildContents', () => {
       },
       provide: {
         isGroup,
+        glFeatures: {
+          workItemStatusFeatureFlag,
+        },
       },
       mocks: {
         $router: {
@@ -85,13 +89,19 @@ describe('WorkItemLinkChildContents', () => {
   });
 
   it.each`
-    status      | childItem             | workItemState | rawTimestamp                   | tooltipContents
-    ${'open'}   | ${workItemTask}       | ${'OPEN'}     | ${workItemTask.createdAt}      | ${'Created'}
-    ${'closed'} | ${closedWorkItemTask} | ${'CLOSED'}   | ${closedWorkItemTask.closedAt} | ${'Closed'}
+    status      | childItem             | workItemState | rawTimestamp                   | tooltipContents | workItemStatusFeatureFlagEnabled
+    ${'open'}   | ${workItemTask}       | ${'OPEN'}     | ${workItemTask.createdAt}      | ${'Created'}    | ${true}
+    ${'closed'} | ${closedWorkItemTask} | ${'CLOSED'}   | ${closedWorkItemTask.closedAt} | ${'Closed'}     | ${false}
   `(
     'renders item status icon and tooltip when item status is `$status`',
-    ({ childItem, workItemState, rawTimestamp, tooltipContents }) => {
-      createComponent({ childItem });
+    ({
+      childItem,
+      workItemState,
+      rawTimestamp,
+      tooltipContents,
+      workItemStatusFeatureFlagEnabled,
+    }) => {
+      createComponent({ childItem, workItemStatusFeatureFlag: workItemStatusFeatureFlagEnabled });
 
       expect(findStatusBadgeComponent().props('workItemState')).toBe(workItemState);
       expect(findStatusTooltipComponent().props('rawTimestamp')).toBe(rawTimestamp);