Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/ml/model_registry/apps/show_ml_model_version.vue

@@ -260,7 +260,7 @@ export default {
           <template #metadata-versions-count>
             <div
               v-if="showCreatedDetail"
-              class="detail-page-header-body mb-3 gl-flex-wrap gl-gap-x-2"
+              class="detail-page-header-body gl-flex-wrap gl-gap-x-2"
               data-testid="metadata"
             >
               <gl-icon name="machine-learning" />
@@ -300,7 +300,7 @@ export default {
     <div class="gl-grid gl-gap-3 md:gl-grid-cols-4">
       <div class="md:gl-col-span-3 md:gl-pr-8">
         <load-or-error-or-show :is-loading="isLoading" :error-message="errorMessage">
-          <gl-tabs class="gl-mt-4" :value="tabIndex">
+          <gl-tabs :value="tabIndex">
             <gl-tab
               :title="$options.i18n.tabs.modelVersionCard"
               @click="goTo($options.ROUTE_DETAILS)"
@@ -315,12 +315,13 @@ export default {
               :title="$options.i18n.tabs.performance"
               @click="goTo($options.ROUTE_PERFORMANCE)"
             />
+
+            <router-view :model-version="modelVersion" import-path allow-artifact-import />
           </gl-tabs>
-          <router-view :model-version="modelVersion" import-path allow-artifact-import />
         </load-or-error-or-show>
       </div>
 
-      <div class="gl-pt-6 md:gl-col-span-1">
+      <div class="gl-pt-4 md:gl-col-span-1">
         <div class="gl-text-lg gl-font-bold">{{ $options.i18n.authorTitle }}</div>
         <div class="gl-mt-3 gl-text-subtle" data-testid="sidebar-author">
           <gl-link

app/assets/javascripts/ml/model_registry/components/import_artifact_zone.vue

@@ -231,7 +231,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-p-5">
+  <div>
     <gl-form-group
       label-for="subfolderId"
       data-testid="subfolderGroup"
@@ -282,20 +282,20 @@ export default {
             <div
               v-if="upload.loading()"
               :data-testid="`formatted-progress-${index}`"
-              class="col-md-2 text-right"
+              class="col-md-2 gl-text-right"
             >
               {{ upload.formattedProgressLoaded() }}
             </div>
             <div v-else :data-testid="`formatted-file-size-${index}`" class="col-md-2 text-right">
               {{ upload.formattedFileSize }}
             </div>
-            <div class="col-md-2 text-right">
+            <div class="col-md-2 gl-text-right">
               <gl-button
                 v-if="upload.isCancelable()"
                 :data-testid="`cancel-button-${index}`"
                 category="secondary"
                 variant="danger"
-                class="mb-2"
+                class="gl-mb-1"
                 @click="upload.cancelUpload"
                 >{{ $options.i18n.cancelButtonText }}
               </gl-button>
@@ -304,7 +304,7 @@ export default {
               <gl-icon v-if="upload.canceled()" name="status_canceled" variant="warning" />
             </div>
           </div>
-          <p v-if="errors[index]" :data-testid="`fb-${index}`" class="row m-0 p-0 gl-text-subtle">
+          <p v-if="errors[index]" :data-testid="`fb-${index}`" class="row m-0 p-0 gl-text-danger">
             {{ errors[index] }}
           </p>
         </div>

app/assets/javascripts/ml/model_registry/components/model_version_artifacts.vue

@@ -45,7 +45,7 @@ export default {
         :package-type="packageType"
       >
         <template v-if="showImportArtifactZone" #upload="{ refetch }">
-          <h3 data-testid="uploadHeader" class="gl-text-lg">
+          <h3 data-testid="uploadHeader" class="gl-my-2 gl-text-base">
             {{ __('Upload artifacts') }}
           </h3>
           <import-artifact-zone :path="importPath" @change="refetch" />

app/assets/javascripts/ml/model_registry/components/model_version_detail.vue

@@ -58,7 +58,7 @@ export default {
     <div class="issue-details issuable-details">
       <div
         v-if="modelVersion.descriptionHtml"
-        class="detail-page-description js-detail-page-description gl-pt-4"
+        class="detail-page-description js-detail-page-description"
       >
         <issuable-description
           data-testid="description"
@@ -67,6 +67,7 @@ export default {
           :can-edit="canEditRequirement"
           :data-update-url="dataUpdateUrl"
           :task-list-update-path="taskListUpdatePath"
+          class="gl-leading-20"
         />
       </div>
       <div v-else class="gl-text-subtle" data-testid="emptyDescriptionState">

app/assets/javascripts/packages_and_registries/package_registry/components/details/package_files.vue

@@ -370,7 +370,7 @@ export default {
     :title="__('Assets')"
     :count="filesTableRows.length"
     icon="doc-compressed"
-    class="gl-mt-6"
+    class="gl-mt-5"
   >
     <template #actions>
       <gl-button
@@ -501,15 +501,19 @@ export default {
           </div>
         </template>
       </gl-table>
-      <div class="gl-flex gl-justify-center">
-        <gl-keyset-pagination
-          :disabled="isLoading"
-          v-bind="pageInfo"
-          class="gl-mt-3"
-          @prev="fetchPreviousFilesPage"
-          @next="fetchNextFilesPage"
-        />
-      </div>
+    </template>
+
+    <template #pagination>
+      <gl-keyset-pagination
+        :disabled="isLoading"
+        v-bind="pageInfo"
+        class="gl-mt-3"
+        @prev="fetchPreviousFilesPage"
+        @next="fetchNextFilesPage"
+      />
+    </template>
+
+    <template #footer>
       <slot name="upload" :refetch="refetchPackageFiles"></slot>
     </template>
 

app/assets/javascripts/packages_and_registries/settings/project/components/container_protection_repository_rules.vue

@@ -128,7 +128,7 @@ export default {
         this.protectionRulesQueryPageInfo.hasNextPage
       );
     },
-    showTopLevelLoadingIcon() {
+    showTopLevelLoading() {
       return this.isLoadingprotectionRules && !this.containsTableItems;
     },
     containerRepositoryMinimumAccessLevelOptions() {
@@ -293,7 +293,7 @@ export default {
       ref="containerProtectionCrud"
       :title="$options.i18n.settingBlockTitle"
       :description="$options.i18n.settingBlockDescription"
-      :is-loading="showTopLevelLoadingIcon"
+      :is-loading="showTopLevelLoading"
       :toggle-text="s__('ContainerRegistry|Add protection rule')"
     >
       <template #form>

app/models/application_setting_implementation.rb

@@ -320,7 +320,7 @@ def defaults # rubocop:disable Metrics/AbcSize
         code_suggestions_api_rate_limit: 60,
         require_personal_access_token_expiry: true,
         pages_extra_deployments_default_expiry_seconds: 86400,
-        scan_execution_policies_action_limit: 10,
+        scan_execution_policies_action_limit: 0,
         scan_execution_policies_schedule_limit: 0,
         seat_control: 0,
         show_migrate_from_jenkins_banner: true,

app/models/concerns/namespaces/adjourned_deletable.rb

@@ -30,10 +30,6 @@ def self_or_ancestor_marked_for_deletion
       ancestors(hierarchy_order: :asc).joins(:deletion_schedule).first
     end
 
-    def permanent_deletion_date(date)
-      date + deletion_adjourned_period.days
-    end
-
     def deletion_adjourned_period
       ::Gitlab::CurrentSettings.deletion_adjourned_period
     end

app/validators/json_schemas/ai_conversation_message_extras.json

@@ -0,0 +1,84 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "description": "Ai Conversation Message Extras",
+  "type": "object",
+  "required": [],
+  "properties": {
+    "additional_context": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "category": {
+            "type": "string"
+          },
+          "content": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "metadata": {
+            "type": "object"
+          }
+        },
+        "additionalProperties": true
+      }
+    },
+    "agent_scratchpad": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "action": {
+            "type": "object",
+            "properties": {
+              "thought": {
+                "type": "string"
+              },
+              "tool": {
+                "type": "string"
+              },
+              "tool_input": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": true
+          },
+          "observation": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": true
+      }
+    },
+    "has_feedback": {
+      "type": "boolean"
+    },
+    "sources": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string"
+          },
+          "source_url": {
+            "type": "string"
+          },
+          "source_type": {
+            "type": "string"
+          },
+          "source": {
+            "type": "string"
+          },
+          "md5sum": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": true
+      }
+    }
+  },
+  "additionalProperties": true
+}

app/views/shared/_label.html.haml

@@ -6,7 +6,7 @@
 - toggle_subscription_path = toggle_subscription_label_path(label, @project) if current_user
 - tooltip_title = label_status_tooltip(label, status) if status
 
-%li.js-label-list-item.gl-list-none.gl-border-b.last-of-type:gl-border-b-0{ id: label_css_id, data: { id: label.id } }
+%li.js-label-list-item.gl-list-none.gl-border-b.gl-border-section.last-of-type:gl-border-b-0{ id: label_css_id, data: { id: label.id } }
   .label-content.gl-pl-5.gl-pr-3.gl-py-4.gl-rounded-base{ class: "#{ 'gl-py-3' if force_priority }" }
     = render "shared/label_row", label: label, force_priority: force_priority
     %ul.label-actions-list

data/deprecations/16-4-ci_job_token_scope_enabled-attribute-deprecation.yml

@@ -2,12 +2,11 @@
 # REQUIRED FIELDS
 #
 - title: "The `ci_job_token_scope_enabled` projects API attribute is deprecated"  # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "CI/CD job names will be limited to 250 characters."
-  removal_milestone: "Pending"  # (required) The milestone when this feature is planned to be removed
+  removal_milestone: "19.0"  # (required) The milestone when this feature is planned to be removed
   announcement_milestone: "16.4"  # (required) The milestone when this feature was first announced as deprecated.
   breaking_change: true  # (required) Change to false if this is not a breaking change.
-  window: 3
   reporter: jocelynjane  # (required) GitLab username of the person reporting the change
-  stage: govern  # (required) String value of the stage that the feature was created in. e.g., Growth
+  stage: Software Supply Chain Security  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423091  # (required) Link to the deprecation issue in GitLab
   impact: low  # Can be one of: [critical, high, medium, low]
   scope: project  # Can be one or a combination of: [instance, group, project]

data/deprecations/17-5-ci-job-token-outbound-removal.yml

@@ -2,22 +2,21 @@
 
 - title: "`ciJobTokenScopeAddProject` GraphQL mutation is deprecated"
   # The milestones for the deprecation announcement, and the removal.
-  removal_milestone: "Pending"
+  removal_milestone: "19.0"
   announcement_milestone: "17.5"
   # Change breaking_change to false if needed.
   breaking_change: true
   # The stage and GitLab username of the person reporting the change,
   # and a link to the deprecation issue
-  window: 3
   reporter: jocelynjane
-  stage: Govern
+  stage: Software Supply Chain Security
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/474175
   impact: low  # Can be one of: [critical, high, medium, low]
   scope: project  # Can be one or a combination of: [instance, group, project]
   resolution_role: Developer  # Can be one of: [Admin, Owner, Maintainer, Developer]
   manual_task: true  # Can be true or false. Use this to denote whether a resolution action must be performed manually (true), or if it can be automated by using the API or other automation (false).
   body: |  # (required) Don't change this line.
-    With the [upcoming default behavior change to the CI/CD job token](https://docs.gitlab.com/update/deprecations/#default-cicd-job-token-ci_job_token-scope-changed) in GitLab 18.0, we are also deprecating the associated `ciJobTokenScopeAddProject` GraphQL mutation as the associated feature will be no longer be available.
+    With the [upcoming default behavior change to the CI/CD job token](https://docs.gitlab.com/update/deprecations/#default-cicd-job-token-ci_job_token-scope-changed) in GitLab 18.0, we are also deprecating the associated `ciJobTokenScopeAddProject` GraphQL mutation in favor of `ciJobTokenScopeAddGroupOrProject`.
 
 # ==============================
 # OPTIONAL END-OF-SUPPORT FIELDS

db/docs/batched_background_migrations/backfill_bulk_import_trackers_namespace_id.yml

@@ -5,4 +5,4 @@ feature_category: importers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180437
 milestone: '17.9'
 queued_migration_version: 20250205195337
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250414075039

db/docs/batched_background_migrations/backfill_bulk_import_trackers_organization_id.yml

@@ -5,4 +5,4 @@ feature_category: importers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180437
 milestone: '17.9'
 queued_migration_version: 20250205195342
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250414075035

db/docs/batched_background_migrations/backfill_bulk_import_trackers_project_id.yml

@@ -5,4 +5,4 @@ feature_category: importers
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180437
 milestone: '17.9'
 queued_migration_version: 20250205195332
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250414075044

db/docs/batched_background_migrations/delete_orphaned_ci_runner_machine_records_on_self_managed.yml

@@ -0,0 +1,11 @@
+---
+migration_job_name: DeleteOrphanedCiRunnerMachineRecordsOnSelfManaged
+description: >
+  Removes ci_runner_machines records that don't have a matching ci_runners record.
+  This can happen because there was a period in time where a FK didn't exist.
+  The equivalent operation has already been done on .com by 20241112165507
+feature_category: fleet_visibility
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188083
+milestone: '18.0'
+queued_migration_version: 20250414101015
+finalized_by: # version of the migration that finalized this BBM

db/migrate/20250414125030_update_application_setting_default_scan_execution_policies_action_limit.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class UpdateApplicationSettingDefaultScanExecutionPoliciesActionLimit < Gitlab::Database::Migration[2.2]
+  milestone "18.0"
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    execute <<~SQL
+      UPDATE application_settings
+      SET security_policies = jsonb_set(
+        security_policies,
+        '{scan_execution_policies_action_limit}',
+        '0'::jsonb,
+        true -- create_missing
+      );
+    SQL
+  end
+
+  def down
+    # irreversible
+  end
+end

db/post_migrate/20250113164152_requeue_delete_orphaned_partitioned_ci_runner_machine_records.rb

@@ -8,7 +8,7 @@ class RequeueDeleteOrphanedPartitionedCiRunnerMachineRecords < Gitlab::Database:
   MIGRATION = "RequeueDeleteOrphanedPartitionedCiRunnerMachineRecords"
 
   def up
-    # no-oped and deleted in 20250307070000_delete20250113164152_post_deployment_migration.rb
+    # no-oped and deleted in 20250307070001_cleanup_requeue_delete_orphaned_partitioned_ci_runner_machine_records.rb
     # since this can collide with 20250307080000_replace_ci_runners_machines_with_partitioned_table which
     # is scheduled for 17.10 (no required stop between them)
   end