Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -1252,6 +1252,7 @@ lib/gitlab/checks/**
 [Localization Team] @gitlab-com/localization/maintainers
 /doc-locale/**
 /doc/development/i18n/proofreader.md
+/argo_translation.yml 
 
 [Authorization] @gitlab-org/software-supply-chain-security/authorization/approvers
 /config/initializers/declarative_policy.rb

GITLAB_KAS_VERSION

@@ -1 +1 @@
-b8a5f8c7440eb511a10903d7f3d1862c96cd6428
+82d009755f8dff37a144d63220fdf70c1643c166

app/assets/javascripts/admin/broadcast_messages/components/message_form.vue

@@ -9,6 +9,7 @@ import {
   GlFormInput,
   GlFormSelect,
   GlFormTextarea,
+  GlModal,
 } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import { s__, __ } from '~/locale';
@@ -43,6 +44,7 @@ export default {
     GlFormInput,
     GlFormSelect,
     GlFormTextarea,
+    GlModal,
   },
   directives: {
     SafeHtml,
@@ -85,6 +87,12 @@ export default {
     showInCliDescription: s__(
       'BroadcastMessages|Show the broadcast message in a command-line interface as a Git remote response',
     ),
+    confirm: {
+      title: s__('BroadcastMessages|Security Notice'),
+      text: s__(
+        'BroadcastMessages|Broadcast messages must not contain sensitive information. All broadcast messages are publicly accessible through the API, regardless of path or role scoping.',
+      ),
+    },
   },
   messageThemes: THEMES,
   messageTypes: TYPES,
@@ -238,14 +246,31 @@ export default {
       }
       return TARGET_ALL;
     },
+    confirmSubmit() {
+      this.$refs.confirmModal.show();
+    },
   },
   safeHtmlConfig: {
     ADD_TAGS: ['use'],
   },
+  modal: {
+    actionPrimary: {
+      text: s__('BroadcastMessages|I understand and confirm'),
+      attributes: {
+        variant: 'confirm',
+      },
+    },
+    actionSecondary: {
+      text: __('Cancel'),
+      attributes: {
+        variant: 'default',
+      },
+    },
+  },
 };
 </script>
 <template>
-  <gl-form @submit.prevent="onSubmit">
+  <gl-form @submit.prevent="confirmSubmit">
     <gl-broadcast-message
       class="gl-my-6"
       :type="type"
@@ -366,5 +391,15 @@ export default {
         {{ $options.i18n.cancel }}
       </gl-button>
     </div>
+
+    <gl-modal
+      ref="confirmModal"
+      modal-id="confirm-modal"
+      :title="$options.i18n.confirm.title"
+      :action-primary="$options.modal.actionPrimary"
+      :action-secondary="$options.modal.actionSecondary"
+      @primary="onSubmit"
+      >{{ $options.i18n.confirm.text }}</gl-modal
+    >
   </gl-form>
 </template>

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

@@ -513,7 +513,7 @@ export default {
       />
     </template>
 
-    <template #footer>
+    <template v-if="$scopedSlots.upload" #footer>
       <slot name="upload" :refetch="refetchPackageFiles"></slot>
     </template>
 

app/assets/javascripts/projects/pipelines/charts/components/app.vue

@@ -1,5 +1,6 @@
 <script>
 import { GlTabs, GlTab } from '@gitlab/ui';
+import MigrationAlert from 'ee_component/analytics/dora/components/migration_alert.vue';
 import { mergeUrlParams, updateHistory, getParameterValues } from '~/lib/utils/url_utility';
 import { __, s__ } from '~/locale';
 import { InternalEvents } from '~/tracking';
@@ -13,9 +14,14 @@ export default {
   components: {
     GlTabs,
     GlTab,
+    MigrationAlert,
   },
   mixins: [InternalEvents.mixin(), glFeatureFlagsMixin()],
   inject: {
+    projectPath: {
+      type: String,
+      default: '',
+    },
     shouldRenderDoraCharts: {
       type: Boolean,
       default: false,
@@ -43,7 +49,7 @@ export default {
       },
     ];
 
-    if (this.shouldRenderDoraCharts) {
+    if (this.shouldRenderDoraCharts && !this.glFeatures.doraMetricsDashboard) {
       tabs.push(
         {
           key: 'deployment-frequency',
@@ -93,6 +99,11 @@ export default {
       tabs,
     };
   },
+  computed: {
+    showDoraMetricsMigrationAlert() {
+      return this.shouldRenderDoraCharts && this.glFeatures.doraMetricsDashboard;
+    },
+  },
   created() {
     this.syncActiveTab();
     window.addEventListener('popstate', this.syncActiveTab);
@@ -118,6 +129,12 @@ export default {
 </script>
 <template>
   <div>
+    <migration-alert
+      v-if="showDoraMetricsMigrationAlert"
+      :namespace-path="projectPath"
+      is-project
+    />
+
     <gl-tabs v-if="tabs.length > 1" :value="activeTabIndex" @input="onTabInput">
       <gl-tab
         v-for="tab in tabs"

app/assets/javascripts/rapid_diffs/toggle_file/adapter.js

@@ -23,6 +23,13 @@ function expand(root = this.diffElement) {
   root.querySelector('[data-file-body]').hidden = false;
 }
 
+function stopTransition(element) {
+  element.style.transition = 'none';
+  requestAnimationFrame(() => {
+    element.style.transition = '';
+  });
+}
+
 export const ToggleFileAdapter = {
   clicks: {
     toggleFile(event, button) {
@@ -32,7 +39,10 @@ export const ToggleFileAdapter = {
       } else {
         collapse.call(this);
       }
-      getOppositeToggleButton(button).focus();
+      const oppositeButton = getOppositeToggleButton(button);
+      oppositeButton.focus();
+      // a replaced button triggers another transition that we need to stop
+      stopTransition(oppositeButton);
     },
   },
   [EXPAND_FILE]() {

app/assets/stylesheets/components/rapid_diffs/diff_file_component.scss

@@ -1,13 +1,10 @@
-@import 'framework/variables';
-
 .rd-diff-file-component {
   scroll-margin-top: var(--rd-app-sticky-top-with-padding);
 }
 
 .rd-diff-file {
-  padding-bottom: $gl-padding;
-
   --rd-diff-file-border-radius: #{calc($gl-border-radius-base - 1px)};
+  padding-bottom: $gl-padding;
 }
 
 .rd-diff-file-header {
@@ -18,8 +15,7 @@
   display: flex;
   background-color: var(--gl-background-color-subtle);
   border: 1px solid var(--gl-border-color-default);
-  padding: $gl-padding-8 $gl-padding;
-  min-height: px-to-rem($file-header-height);
+  padding: $gl-spacing-scale-3 $gl-spacing-scale-4;
   border-radius: var(--rd-diff-file-border-radius) var(--rd-diff-file-border-radius) 0 0;
   word-break: break-word;
   z-index: 1;
@@ -46,7 +42,7 @@
 }
 
 .rd-diff-file-toggle {
-  margin-right: $gl-spacing-scale-2;
+  margin-right: $gl-spacing-scale-3;
 }
 
 .rd-diff-file[data-collapsed] .rd-diff-file-toggle-button[data-opened],

app/assets/stylesheets/components/rapid_diffs/text_file_viewers.scss

@@ -111,7 +111,10 @@
 }
 
 // Do not use nesting here to allow quick jump to code based on the selector
-.rd-line-number:hover:not(:empty) {
+.rd-line-number:hover:not(:empty),
+.rd-hunk-lines-inline:hover .rd-line-number,
+.rd-hunk-lines:has(.rd-line-content[data-position=new]:hover:not(:empty)) .rd-line-number[data-position=new],
+.rd-hunk-lines:has(.rd-line-content[data-position=old]:hover:not(:empty)) .rd-line-number[data-position=old] {
   background-color: var(--code-line-nubmer-hover-background-color, $gl-color-purple-100);
   border-color: var(--code-line-nubmer-hover-border-color, $gl-color-purple-200);
 }

app/assets/stylesheets/framework/header.scss

@@ -80,7 +80,7 @@
   margin-left: -4px;
   height: 32px;
   width: auto;
-  border-radius: $gl-border-radius-base;
+  @apply gl-rounded-base;
 
   &:hover,
   &:focus {
@@ -106,7 +106,7 @@
   appearance: none;
   border: 0;
   background-color: transparent;
-  border-radius: $gl-border-radius-base;
+  @apply gl-rounded-base;
 }
 
 .header-logged-out-dropdown {
@@ -125,7 +125,7 @@
     display: inline-block;
     padding: 6px 8px;
     height: 32px;
-    border-radius: $gl-border-radius-base;
+    @apply gl-rounded-base;
     color: var(--gl-color-neutral-100);
     font-weight: $gl-font-weight-normal;
     font-size: $gl-font-size;

app/assets/stylesheets/framework/popup.scss

@@ -9,7 +9,7 @@
   padding: $gl-padding;
   background-color: $gray-10;
   border: 1px solid $gray-50;
-  border-radius: $gl-border-radius-base;
+  @apply gl-rounded-base;
   box-shadow: 0 5px 8px $popup-box-shadow-color;
   position: relative;
 }