Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/as-if-foss.gitlab-ci.yml

@@ -92,7 +92,6 @@ start-as-if-foss:
     ENABLE_RSPEC_MIGRATION: $ENABLE_RSPEC_MIGRATION
     ENABLE_RSPEC_BACKGROUND_MIGRATION: $ENABLE_RSPEC_BACKGROUND_MIGRATION
     ENABLE_RSPEC_FRONTEND_FIXTURE: $ENABLE_RSPEC_FRONTEND_FIXTURE
-    ENABLE_BUILD_ASSETS_IMAGE: $ENABLE_BUILD_ASSETS_IMAGE
     ENABLE_BUILD_QA_IMAGE: $ENABLE_BUILD_QA_IMAGE
     ENABLE_COMPILE_PRODUCTION_ASSETS: $ENABLE_COMPILE_PRODUCTION_ASSETS
     ENABLE_COMPILE_STORYBOOK: $ENABLE_COMPILE_STORYBOOK

.gitlab/ci/build-images.gitlab-ci.yml

@@ -50,30 +50,3 @@ build-gdk-image:
       optional: true
   script:
     - run_with_custom_exit_code scripts/build_gdk_image
-
-# NOTE: release-tools verifies the presence on this job for a commit that is
-# candidate to an auto-deploy package. This job name can't be changed without
-# changing the code in release-tools.
-# TODO: assets image is built in compile-production-assets job, update release-tools to not depend on this job
-build-assets-image:
-  extends:
-    - .base-image-build-buildx
-    - .build-images:rules:build-assets-image
-  stage: build-images
-  needs: ["compile-production-assets"]
-  variables:
-    GLCI_BUILD_ASSETS_IMAGE: "true"
-    ARCH: linux/amd64,linux/arm64
-  script:
-    - scripts/build_assets_image
-  artifacts:
-    expire_in: 7 days
-    paths:
-      - cached-assets-hash.txt
-
-build-assets-image as-if-foss:
-  extends:
-    - build-assets-image
-    - .as-if-foss
-    - .qa:rules:test-on-omnibus-ce:follow-up
-  needs: ["compile-production-assets as-if-foss"]

.gitlab/ci/frontend.gitlab-ci.yml

@@ -55,8 +55,7 @@ compile-production-assets:
     name: webpack-report
     expire_in: 31d
     paths:
-      # These assets are used in multiple locations:
-      # - in `build-assets-image` job to create assets image for packaging systems
+      # These assets are used in:
       # - GitLab UI for integration tests: https://gitlab.com/gitlab-org/gitlab-ui/-/blob/e88493b3c855aea30bf60baee692a64606b0eb1e/.storybook/preview-head.pug#L1
       - cached-assets-hash.txt
       - public/assets/

.gitlab/ci/qa.gitlab-ci.yml

@@ -191,7 +191,7 @@ e2e:test-on-omnibus-ce:
     - e2e:test-on-omnibus-ee
     - .qa:rules:test-on-omnibus-ce:follow-up
   needs:
-    - build-assets-image as-if-foss
+    - compile-production-assets as-if-foss
     - build-qa-image as-if-foss
     - e2e-test-pipeline-generate as-if-foss
   variables:

.gitlab/ci/review.gitlab-ci.yml

@@ -78,7 +78,7 @@ start-review-app-pipeline:
       optional: true
     - job: rails-production-server-boot-puma-cng
       optional: true
-    - job: build-assets-image
+    - job: compile-production-assets
       artifacts: false
   # We do not want to have ALL global variables passed as trigger variables,
   # as they cannot be overridden. See this issue for more context:

.gitlab/ci/rules.gitlab-ci.yml

@@ -1146,27 +1146,6 @@
     - <<: *if-merge-request
       changes: *code-qa-patterns
 
-.build-images:rules:build-assets-image:
-  rules:
-    - <<: *if-not-canonical-namespace
-      when: never
-    - <<: *if-merge-request-labels-pipeline-expedite
-      when: never
-    - if: '$ENABLE_BUILD_ASSETS_IMAGE == "true"'
-    - <<: *if-tag
-    - <<: *if-sync-changes-on-stable-branches
-    - !reference [".frontend:rules:assets-shared", rules]
-    # Always build on stable branches to serve release-environments pipeline
-    # Do not refer directly to .release-environments:rules:start-release-environments-security-pipeline
-    # to avoid the side effect of "never" rules
-    - !reference [".releases:rules:canonical-dot-com-security-gitlab-stable-branch-only", rules]
-
-.build-images:rules:build-assets-image-as-if-foss:
-  rules:
-    - <<: *if-not-ee
-      when: never
-    - !reference [".build-images:rules:build-assets-image", "rules"]
-
 #################
 # Caching rules #
 #################
@@ -3144,7 +3123,6 @@
 # We want to start this for any FOSS jobs we want to run. For example:
 # (This is not an exhaustive list and can be outdated!)
 # .build-images:rules:build-qa-image-merge-requests
-# .build-images:rules:build-assets-image
 # .frontend:rules:compile-production-assets
 # .rails:rules:single-db
 # .rails:rules:single-db-ci-connection

.gitlab/ci/setup.gitlab-ci.yml

@@ -212,7 +212,7 @@ e2e-test-pipeline-generate:
 
 # This is the start of the chain of E2E jobs for CE
 # After playing this, it'll follow up with:
-# compile-production-assets as-if-foss -> build-assets-image as-if-foss --\
+# compile-production-assets as-if-foss --\
 #                                                                         \-> e2e:test-on-omnibus-ce
 # build-qa-image as-if-foss ----------------------------------------------/
 e2e-test-pipeline-generate as-if-foss:

.gitlab/ci/test-on-cng/main.gitlab-ci.yml

@@ -95,8 +95,6 @@ build-cng-env:
   needs:
     - pipeline: $PARENT_PIPELINE_ID
       job: clone-gitlab-repo
-    - pipeline: $PARENT_PIPELINE_ID
-      job: compile-production-assets
   variables:
     CNG_COMMIT_SHA: $GITLAB_CNG_MIRROR_REF
     CNG_ACCESS_TOKEN: $CNG_MIRROR_ACCESS_TOKEN

GITALY_SERVER_VERSION

@@ -1 +1 @@
-c45474cf95ee58efeeebe7adf6a6892b511db5ef
+a588d34c7e1cc71a5038efa9745ee637b23bf8c7

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

@@ -26,7 +26,7 @@ export default {
 
 <template>
   <div class="gl-flex gl-items-center gl-justify-between">
-    <h3 class="gl-text-lg">{{ __('Installation') }}</h3>
+    <h2 class="gl-heading-2">{{ __('Installation') }}</h2>
     <div>
       <persisted-dropdown-selection
         :storage-key="storageKey"

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

@@ -41,6 +41,7 @@ import {
   DELETE_ALL_PACKAGE_FILES_MODAL_CONTENT,
   DELETE_LAST_PACKAGE_FILE_MODAL_CONTENT,
 } from '~/packages_and_registries/package_registry/constants';
+import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import getPackageFilesQuery from '~/packages_and_registries/package_registry/graphql/queries/get_package_files.query.graphql';
 import destroyPackageFilesMutation from '~/packages_and_registries/package_registry/graphql/mutations/destroy_package_files.mutation.graphql';
 
@@ -61,6 +62,7 @@ export default {
     FileIcon,
     TimeAgoTooltip,
     FileSha,
+    CrudComponent,
   },
   mixins: [Tracking.mixin()],
   trackingActions: {
@@ -171,6 +173,7 @@ export default {
           label: '',
           hide: !this.canDelete,
           thClass: 'gl-w-4',
+          tdClass: 'gl-text-right',
         },
       ].filter((c) => !c.hide);
     },
@@ -363,20 +366,26 @@ export default {
 </script>
 
 <template>
-  <div class="gl-pt-6">
-    <div class="gl-flex gl-items-center gl-justify-between">
-      <h3 class="gl-mt-5 gl-text-lg">{{ __('Assets') }}</h3>
+  <crud-component
+    :title="__('Assets')"
+    :count="filesTableRows.length"
+    icon="doc-compressed"
+    class="gl-mt-6"
+  >
+    <template #actions>
       <gl-button
         v-if="!fetchPackageFilesError && canDelete"
         :disabled="isLoading || !areFilesSelected"
         category="secondary"
         variant="danger"
+        size="small"
         data-testid="delete-selected"
         @click="handleFileDeleteSelected"
       >
         {{ $options.i18n.deleteSelected }}
       </gl-button>
-    </div>
+    </template>
+
     <gl-alert
       v-if="fetchPackageFilesError"
       variant="danger"
@@ -394,6 +403,7 @@ export default {
         selectable
         select-mode="multi"
         selected-variant="primary"
+        stacked="sm"
         :tbody-tr-attr="{ 'data-testid': 'file-row' }"
         @row-selected="updateSelectedReferences"
       >
@@ -531,5 +541,5 @@ export default {
         </template>
       </gl-sprintf>
     </gl-modal>
-  </div>
+  </crud-component>
 </template>

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

@@ -129,8 +129,8 @@ export default {
 </script>
 
 <template>
-  <div class="issuable-discussion">
-    <h3 class="gl-text-lg" data-testid="title">{{ __('History') }}</h3>
+  <div class="issuable-discussion gl-mt-3">
+    <h2 class="gl-heading-2" data-testid="title">{{ __('History') }}</h2>
     <gl-alert
       v-if="fetchPackagePipelinesError"
       variant="danger"

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

@@ -1,5 +1,5 @@
 <script>
-import { GlAlert, GlSprintf, GlLink, GlCard, GlButton, GlSkeletonLoader } from '@gitlab/ui';
+import { GlAlert, GlSprintf, GlLink, GlButton } from '@gitlab/ui';
 import {
   CONTAINER_CLEANUP_POLICY_TITLE,
   CONTAINER_CLEANUP_POLICY_DESCRIPTION,
@@ -13,16 +13,16 @@ import {
 } from '~/packages_and_registries/settings/project/constants';
 import expirationPolicyEnabledQuery from '~/packages_and_registries/settings/project/graphql/queries/get_expiration_policy_enabled.query.graphql';
 import ContainerExpirationPolicyEnabledText from '~/packages_and_registries/settings/project/components/container_expiration_policy_enabled_text.vue';
+import CrudComponent from '~/vue_shared/components/crud_component.vue';
 
 export default {
   components: {
     ContainerExpirationPolicyEnabledText,
     GlAlert,
     GlSprintf,
     GlLink,
-    GlCard,
     GlButton,
-    GlSkeletonLoader,
+    CrudComponent,
   },
   inject: [
     'projectPath',
@@ -90,70 +90,63 @@ export default {
 </script>
 
 <template>
-  <gl-card data-testid="container-expiration-policy-project-settings">
-    <template #header>
-      <header class="gl-flex gl-flex-wrap gl-justify-between">
-        <h2
-          class="gl-m-0 gl-inline-flex gl-items-center gl-text-base gl-font-bold gl-leading-normal"
-        >
-          {{ $options.i18n.CONTAINER_CLEANUP_POLICY_TITLE }}
-        </h2>
-        <gl-button
-          v-if="isEnabled"
-          data-testid="rules-button"
-          :href="cleanupSettingsPath"
-          :loading="isLoading"
-          category="secondary"
-          size="small"
-          variant="confirm"
-        >
-          {{ cleanupRulesButtonText }}
-        </gl-button>
-      </header>
+  <crud-component
+    :title="$options.i18n.CONTAINER_CLEANUP_POLICY_TITLE"
+    :is-loading="isLoading"
+    data-testid="container-expiration-policy-project-settings"
+  >
+    <template #actions>
+      <gl-button
+        v-if="isEnabled"
+        data-testid="rules-button"
+        :href="cleanupSettingsPath"
+        :loading="isLoading"
+        category="secondary"
+        size="small"
+        class="gl-self-start"
+      >
+        {{ cleanupRulesButtonText }}
+      </gl-button>
     </template>
-    <template #default>
-      <p class="gl-text-subtle" data-testid="description">
-        <gl-sprintf :message="$options.i18n.CONTAINER_CLEANUP_POLICY_DESCRIPTION">
+    <template #description>
+      <gl-sprintf :message="$options.i18n.CONTAINER_CLEANUP_POLICY_DESCRIPTION">
+        <template #link="{ content }">
+          <gl-link :href="helpPagePath">{{ content }}</gl-link>
+        </template>
+      </gl-sprintf>
+    </template>
+
+    <template v-if="isEnabled">
+      <container-expiration-policy-enabled-text
+        v-if="isCleanupEnabled"
+        :next-run-at="containerTagsExpirationPolicy.nextRunAt"
+      />
+      <p v-else data-testid="empty-cleanup-policy" class="gl-mb-0 gl-text-subtle">
+        {{
+          s__(
+            'ContainerRegistry|Registry cleanup disabled. Either no cleanup policies are enabled, or this project has no container images.',
+          )
+        }}
+      </p>
+    </template>
+    <template v-else>
+      <gl-alert
+        v-if="showDisabledFormMessage"
+        :dismissible="false"
+        :title="$options.i18n.UNAVAILABLE_FEATURE_TITLE"
+        variant="tip"
+      >
+        {{ $options.i18n.UNAVAILABLE_FEATURE_INTRO_TEXT }}
+
+        <gl-sprintf :message="unavailableFeatureMessage">
           <template #link="{ content }">
-            <gl-link :href="helpPagePath">{{ content }}</gl-link>
+            <gl-link :href="adminSettingsPath">{{ content }}</gl-link>
           </template>
         </gl-sprintf>
-      </p>
-      <div v-if="isLoading" class="gl-my-3">
-        <gl-skeleton-loader :lines="1" />
-      </div>
-      <template v-else-if="isEnabled">
-        <container-expiration-policy-enabled-text
-          v-if="isCleanupEnabled"
-          :next-run-at="containerTagsExpirationPolicy.nextRunAt"
-        />
-        <p v-else data-testid="empty-cleanup-policy" class="gl-mb-0 gl-text-subtle">
-          {{
-            s__(
-              'ContainerRegistry|Registry cleanup disabled. Either no cleanup policies are enabled, or this project has no container images.',
-            )
-          }}
-        </p>
-      </template>
-      <template v-else>
-        <gl-alert
-          v-if="showDisabledFormMessage"
-          :dismissible="false"
-          :title="$options.i18n.UNAVAILABLE_FEATURE_TITLE"
-          variant="tip"
-        >
-          {{ $options.i18n.UNAVAILABLE_FEATURE_INTRO_TEXT }}
-
-          <gl-sprintf :message="unavailableFeatureMessage">
-            <template #link="{ content }">
-              <gl-link :href="adminSettingsPath">{{ content }}</gl-link>
-            </template>
-          </gl-sprintf>
-        </gl-alert>
-        <gl-alert v-else-if="fetchSettingsError" variant="warning" :dismissible="false">
-          <gl-sprintf :message="$options.i18n.FETCH_SETTINGS_ERROR_MESSAGE" />
-        </gl-alert>
-      </template>
+      </gl-alert>
+      <gl-alert v-else-if="fetchSettingsError" variant="warning" :dismissible="false">
+        <gl-sprintf :message="$options.i18n.FETCH_SETTINGS_ERROR_MESSAGE" />
+      </gl-alert>
     </template>
-  </gl-card>
+  </crud-component>
 </template>