Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitignore

@@ -117,3 +117,6 @@ jest-snapshot-test-report.json
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
 /config/vite.gdk.json
+
+# CSS compilation for cssbundling
+app/assets/builds/

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

@@ -1152,15 +1152,15 @@
     # If any of the files that are DIRECTLY related to generating or managing the GLFM specification change,
     # run `glfm-verify` to get quick feedback on any needed updates, even if the MR is not yet approved
     - <<: *if-default-refs
-    - changes: *glfm-patterns
+      changes: *glfm-patterns
     # Otherwise do not run `glfm-verify` if the MR is not approved
     - <<: *if-merge-request-not-approved
       when: never
     # If we passed all the previous rules, run `glfm-verify` if there are any changes that could impact `glfm-verify`.
     # This could potentially be a wide range of files, so we reuse `setup-test-env-patterns`, which includes
     # almost all app files except docs files.
     - <<: *if-default-refs
-    - changes: *setup-test-env-patterns
+      changes: *setup-test-env-patterns
     # If we are forcing all rspec to run, run this job too.
     - <<: *if-merge-request-labels-run-all-rspec
 

GITALY_SERVER_VERSION

@@ -1 +1 @@
-a22e2401ee6aa35ae70ca67013264b72fc29b6f5
+7eb79ebcb084d4e881777f44ca5055cce6e60ccf

app/assets/javascripts/editor/schema/ci.json

@@ -1750,6 +1750,9 @@
                   "project",
                   "ref"
                 ]
+              },
+              {
+                "$ref": "#/definitions/!reference"
               }
             ]
           }

app/assets/javascripts/usage_quotas/storage/components/dependency_proxy_usage.vue

@@ -0,0 +1,55 @@
+<script>
+import UsageBanner from '~/vue_shared/components/usage_quotas/usage_banner.vue';
+import { s__ } from '~/locale';
+import NumberToHumanSize from '~/vue_shared/components/number_to_human_size/number_to_human_size.vue';
+import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
+
+export default {
+  name: 'DependencyProxyUsage',
+  components: {
+    NumberToHumanSize,
+    HelpPageLink,
+    UsageBanner,
+  },
+  props: {
+    dependencyProxyTotalSize: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
+    loading: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  i18n: {
+    dependencyProxy: s__('UsageQuota|Dependency proxy'),
+    storageUsed: s__('UsageQuota|Storage used'),
+    dependencyProxyMessage: s__(
+      'UsageQuota|Local proxy used for frequently-accessed upstream Docker images.',
+    ),
+  },
+};
+</script>
+<template>
+  <usage-banner :loading="loading">
+    <template #left-primary-text>
+      {{ $options.i18n.dependencyProxy }}
+    </template>
+    <template #left-secondary-text>
+      <div data-testid="dependency-proxy-description">
+        {{ $options.i18n.dependencyProxyMessage }}
+        <help-page-link href="user/packages/dependency_proxy/index">
+          {{ __('More information') }}
+        </help-page-link>
+      </div>
+    </template>
+    <template #right-primary-text>
+      {{ $options.i18n.storageUsed }}
+    </template>
+    <template #right-secondary-text>
+      <number-to-human-size :value="dependencyProxyTotalSize" data-testid="dependency-proxy-size" />
+    </template>
+  </usage-banner>
+</template>

app/assets/javascripts/usage_quotas/storage/components/namespace_storage_app.vue

@@ -1,13 +1,16 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
 import StorageUsageStatistics from 'ee_else_ce/usage_quotas/storage/components/storage_usage_statistics.vue';
+import DependencyProxyUsage from '~/usage_quotas/storage/components/dependency_proxy_usage.vue';
 
 export default {
   name: 'NamespaceStorageApp',
   components: {
     GlAlert,
     StorageUsageStatistics,
+    DependencyProxyUsage,
   },
+  inject: ['userNamespace'],
   props: {
     namespaceLoadingError: {
       type: Boolean,
@@ -39,6 +42,9 @@ export default {
         this.namespace.rootStorageStatistics?.storageSize
       );
     },
+    dependencyProxyTotalSize() {
+      return this.namespace.rootStorageStatistics?.dependencyProxySize ?? 0;
+    },
   },
 };
 </script>
@@ -61,6 +67,14 @@ export default {
       :used-storage="usedStorage"
       :loading="isNamespaceStorageStatisticsLoading"
     />
+    <h3 data-testid="breakdown-subtitle">
+      {{ s__('UsageQuota|Storage usage breakdown') }}
+    </h3>
+    <dependency-proxy-usage
+      v-if="!userNamespace"
+      :dependency-proxy-total-size="dependencyProxyTotalSize"
+      :loading="isNamespaceStorageStatisticsLoading"
+    />
 
     <slot name="ee-storage-app"></slot>
   </div>

app/assets/javascripts/work_items/components/work_item_links/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import { GlToast } from '@gitlab/ui';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
 import WorkItemLinks from './work_item_links.vue';
 
@@ -20,6 +21,7 @@ export default function initWorkItemLinks() {
     registerPath,
     signInPath,
     wiReportAbusePath,
+    isGroup,
   } = workItemLinksRoot.dataset;
 
   return new Vue({
@@ -34,6 +36,7 @@ export default function initWorkItemLinks() {
       registerPath,
       signInPath,
       reportAbusePath: wiReportAbusePath,
+      isGroup: parseBoolean(isGroup),
     },
     render: (createElement) =>
       createElement(WorkItemLinks, {

app/assets/stylesheets/page_bundles/issuable_list.scss

@@ -90,7 +90,7 @@
 .issuable-list li,
 .issuable-info-container .controls {
   .avatar-counter {
-    @include gl-pl-1
+    @include gl-pl-1;
     @include gl-pr-2;
     @include gl-h-5;
     @include gl-min-w-5;

app/controllers/admin/users_controller.rb

@@ -10,7 +10,7 @@ class Admin::UsersController < Admin::ApplicationController
   before_action :set_shared_view_parameters, only: [:show, :projects, :keys]
 
   before_action only: [:index] do
-    push_frontend_feature_flag(:simplified_badges)
+    push_frontend_feature_flag(:simplified_badges, current_user)
   end
 
   feature_category :user_management

app/views/admin/spam_logs/_spam_log.html.haml

@@ -29,9 +29,8 @@
         variant: :danger,
         method: :delete,
         href: admin_spam_log_path(spam_log, remove_user: true),
-        button_options: { data: { confirm: _("User %{user_name} will be removed! Are you sure?") % { user_name: user.name }, confirm_btn_variant: 'danger' }, aria: { label: _('Remove user') } }) do
+        button_options: { class: ' gl-mb-3', data: { confirm: _("User %{user_name} will be removed! Are you sure?") % { user_name: user.name }, confirm_btn_variant: 'danger' } }) do
         = _('Remove user')
-  %td
     -# TODO: Remove conditonal once spamcheck supports this https://gitlab.com/gitlab-com/gl-security/engineering-and-research/automation-team/spam/spamcheck/-/issues/190
     - if akismet_enabled?
       - if spam_log.submitted_as_ham?