Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.eslint_todo/vue-no-unused-properties.mjs

@@ -377,7 +377,6 @@ export default {
     'ee/app/assets/javascripts/iterations/components/iteration_report.vue',
     'ee/app/assets/javascripts/linked_resources/components/resource_links_block.vue',
     'ee/app/assets/javascripts/logs/list/related_issues/related_issues_provider.vue',
-    'ee/app/assets/javascripts/members/promotion_requests/components/app.vue',
     'ee/app/assets/javascripts/merge_requests/components/reviewers/approval_summary.vue',
     'ee/app/assets/javascripts/metrics/details/metrics_details.vue',
     'ee/app/assets/javascripts/metrics/details/metrics_line_chart.vue',

.gitlab/ci/docs.gitlab-ci.yml

@@ -76,7 +76,7 @@ docs code_quality:
     when: always
 
 docs hugo_build:
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/technical-writing/docs-gitlab-com/docs-gitlab-com-builder:hugo-0.142.0
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/technical-writing/docs-gitlab-com/docs-gitlab-com-builder:hugo-0.145.0
   extends:
     - .default-retry
     - .docs:rules:docs-lint

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -3530,7 +3530,6 @@ Gitlab/BoundedContexts:
     - 'ee/lib/bulk_imports/projects/pipelines/push_rule_pipeline.rb'
     - 'ee/lib/bulk_imports/projects/pipelines/vulnerabilities_pipeline.rb'
     - 'ee/lib/delay.rb'
-    - 'ee/lib/duo_pro/bulk_user_assignment.rb'
     - 'ee/lib/ee/bulk_imports/groups/stage.rb'
     - 'ee/lib/ee/bulk_imports/projects/pipelines/issues_pipeline.rb'
     - 'ee/lib/ee/bulk_imports/projects/stage.rb'

.rubocop_todo/layout/line_break_after_final_mixin.yml

@@ -79,7 +79,6 @@ Layout/LineBreakAfterFinalMixin:
     - 'ee/lib/api/dependency_proxy/packages/maven.rb'
     - 'ee/lib/api/resource_iteration_events.rb'
     - 'ee/lib/api/resource_weight_events.rb'
-    - 'ee/lib/duo_pro/bulk_user_assignment.rb'
     - 'ee/lib/ee/api/entities/project_push_rule.rb'
     - 'ee/lib/ee/gitlab/background_migration/create_compliance_standards_adherence.rb'
     - 'ee/lib/gitlab/auth/group_saml/identity_linker.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-d5b6a529fbff95ae2f8479a95ae375abaa497ae1
+5603e4787366e8a2b02491ab921364627efc3ed3

app/assets/javascripts/clusters_list/components/agent_token.vue

@@ -1,16 +1,12 @@
 <script>
 import { GlAlert, GlFormInputGroup, GlLink, GlSprintf, GlIcon } from '@gitlab/ui';
-import { helpPagePath } from '~/helpers/help_page_helper';
 import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 import CodeBlock from '~/vue_shared/components/code_block.vue';
 import { generateAgentRegistrationCommand } from '../clusters_util';
 import { I18N_AGENT_TOKEN, HELM_VERSION_POLICY_URL } from '../constants';
 
 export default {
   i18n: I18N_AGENT_TOKEN,
-  advancedInstallPath: helpPagePath('user/clusters/agent/install/_index', {
-    anchor: 'advanced-installation-method',
-  }),
   HELM_VERSION_POLICY_URL,
   components: {
     GlAlert,
@@ -95,17 +91,5 @@ export default {
         :modal-id="modalId"
       />
     </p>
-
-    <p>
-      <strong>{{ $options.i18n.advancedInstallTitle }}</strong>
-    </p>
-
-    <p>
-      <gl-sprintf :message="$options.i18n.advancedInstallBody">
-        <template #link="{ content }">
-          <gl-link :href="$options.advancedInstallPath" target="_blank"> {{ content }}</gl-link>
-        </template>
-      </gl-sprintf>
-    </p>
   </div>
 </template>

app/assets/javascripts/clusters_list/constants.js

@@ -98,18 +98,13 @@ export const I18N_AGENT_TOKEN = {
   ),
   tokenSubtitle: s__('ClusterAgents|The agent uses the token to connect with GitLab.'),
 
-  basicInstallTitle: s__('ClusterAgents|Install using Helm (recommended)'),
+  basicInstallTitle: s__('ClusterAgents|Install using Helm'),
   basicInstallBody: s__(
     'ClusterAgents|From a terminal, connect to your cluster and run this command. The token is included in the command.',
   ),
   helmVersionText: s__(
     'ClusterAgents|Use a Helm version compatible with your Kubernetes version (see %{linkStart}Helm version support policy%{linkEnd}).',
   ),
-
-  advancedInstallTitle: s__('ClusterAgents|Advanced installation methods'),
-  advancedInstallBody: s__(
-    'ClusterAgents|%{linkStart}View the documentation%{linkEnd} for advanced installation. Ensure you have your access token available.',
-  ),
 };
 
 export const HELM_VERSION_POLICY_URL = 'https://helm.sh/docs/topics/version_skew/';

app/assets/javascripts/import_entities/import_groups/components/import_table.vue

@@ -812,7 +812,7 @@ export default {
           class="import-table-bar gl-sticky gl-z-3 gl-flex-col gl-bg-subtle gl-px-5 md:gl-flex md:gl-flex-row md:gl-items-center md:gl-justify-between"
         >
           <div class="gl-flex gl-w-full gl-items-center gl-gap-4 gl-pb-4">
-            <span data-test-id="selection-count">
+            <span data-testid="selection-count">
               <gl-sprintf :message="__('%{count} selected')">
                 <template #count>
                   {{ selectedGroupsIds.length }}
@@ -885,7 +885,7 @@ export default {
             />
           </template>
           <template #head(importTarget)="data">
-            <span data-test-id="new-path-col">
+            <span data-testid="new-path-col">
               <span class="gl-mr-2">{{ data.label }}</span
               ><gl-icon
                 v-gl-tooltip="s__('BulkImport|Path of the new group.')"

app/assets/javascripts/notes/components/comment_form.vue

@@ -98,6 +98,7 @@ export default {
         [constants.ISSUE_NOTEABLE_TYPE]: this.$options.i18n.issue,
         [constants.EPIC_NOTEABLE_TYPE]: this.$options.i18n.epic,
         [constants.MERGE_REQUEST_NOTEABLE_TYPE]: this.$options.i18n.mergeRequest,
+        [constants.INCIDENT_NOTEABLE_TYPE]: this.$options.i18n.incident,
       };
 
       const noteableTypeKey =

app/assets/javascripts/notes/components/notes_app.vue

@@ -161,6 +161,12 @@ export default {
       return this.sortDirection === constants.DESC;
     },
     noteableType() {
+      if (this.noteableData.type?.toUpperCase() === constants.INCIDENT_NOTEABLE_TYPE) {
+        return (
+          this.noteableData.type.charAt(0).toUpperCase() +
+          this.noteableData.type.slice(1).toLowerCase()
+        );
+      }
       return this.noteableData.noteableType;
     },
     previewNoteId() {