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() {

app/assets/javascripts/notes/i18n.js

@@ -10,6 +10,7 @@ export const COMMENT_FORM = {
   wiki: __('Wiki'),
   internalComment: __('Add internal note'),
   issue: __('issue'),
+  incident: __('incident'),
   startThread: __('Start thread'),
   startInternalThread: __('Start internal thread'),
   mergeRequest: __('merge request'),

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

@@ -12,6 +12,7 @@ import {
   NPM_PACKAGE_MANAGER,
   YARN_PACKAGE_MANAGER,
   PROJECT_PACKAGE_ENDPOINT_TYPE,
+  GROUP_PACKAGE_ENDPOINT_TYPE,
   INSTANCE_PACKAGE_ENDPOINT_TYPE,
   NPM_HELP_PATH,
 } from '~/packages_and_registries/package_registry/constants';
@@ -26,7 +27,7 @@ export default {
     GlSprintf,
     GlFormRadioGroup,
   },
-  inject: ['npmInstanceUrl'],
+  inject: ['npmInstanceUrl', 'npmGroupUrl'],
   props: {
     packageEntity: {
       type: Object,
@@ -63,12 +64,18 @@ export default {
 
       return `${instruction} ${this.packageEntity.name}`;
     },
+    npmPath(endpointType) {
+      const endpointMap = {
+        [INSTANCE_PACKAGE_ENDPOINT_TYPE]: this.npmInstanceUrl,
+        [GROUP_PACKAGE_ENDPOINT_TYPE]: this.npmGroupUrl,
+      };
+
+      return endpointMap[endpointType] || this.packageEntity.npmUrl;
+    },
     npmSetupCommand(type, endpointType) {
       const scope = this.packageEntity.name.substring(0, this.packageEntity.name.indexOf('/'));
-      const npmPathForEndpoint =
-        endpointType === INSTANCE_PACKAGE_ENDPOINT_TYPE
-          ? this.npmInstanceUrl
-          : this.packageEntity.npmUrl;
+
+      const npmPathForEndpoint = this.npmPath(endpointType);
 
       if (type === NPM_PACKAGE_MANAGER) {
         return `echo ${scope}:registry=${npmPathForEndpoint}/ >> .npmrc`;
@@ -99,6 +106,7 @@ export default {
   ],
   packageEndpointTypeOptions: [
     { value: INSTANCE_PACKAGE_ENDPOINT_TYPE, text: s__('PackageRegistry|Instance-level') },
+    { value: GROUP_PACKAGE_ENDPOINT_TYPE, text: s__('PackageRegistry|Group-level') },
     { value: PROJECT_PACKAGE_ENDPOINT_TYPE, text: s__('PackageRegistry|Project-level') },
   ],
 };

app/assets/javascripts/packages_and_registries/package_registry/constants.js

@@ -168,6 +168,7 @@ export const NPM_PACKAGE_MANAGER = 'npm';
 export const YARN_PACKAGE_MANAGER = 'yarn';
 
 export const PROJECT_PACKAGE_ENDPOINT_TYPE = 'project';
+export const GROUP_PACKAGE_ENDPOINT_TYPE = 'group';
 export const INSTANCE_PACKAGE_ENDPOINT_TYPE = 'instance';
 
 export const GRAPHQL_PAGE_SIZE = 20;

app/assets/javascripts/packages_and_registries/package_registry/index.js

@@ -17,6 +17,7 @@ export default () => {
     pageType,
     emptyListIllustration,
     npmInstanceUrl,
+    npmGroupUrl,
     projectListUrl,
     groupListUrl,
     settingsPath,
@@ -46,6 +47,7 @@ export default () => {
         emptyListIllustration,
         isGroupPage,
         npmInstanceUrl,
+        npmGroupUrl,
         projectListUrl,
         groupListUrl,
         breadCrumbState,

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

@@ -7,28 +7,29 @@ function getMenuItems(container) {
 
 export const OptionsMenuAdapter = {
   clicks: {
-    toggleOptionsMenu(event) {
-      const button = event.target.closest('.js-options-button');
-      const menuContainer = button.parentElement;
+    toggleOptionsMenu(event, button) {
+      const menuContainer = this.diffElement.querySelector('[data-options-menu]');
       const items = getMenuItems(menuContainer);
-
-      if (!this.sink.optionsMenu) {
-        this.sink.optionsMenu = new Vue({
-          el: Vue.version.startsWith('2') ? button : menuContainer,
-          name: 'GlDisclosureDropdown',
-          render: (createElement = Vue.h) =>
-            createElement(GlDisclosureDropdown, {
-              props: {
-                icon: 'ellipsis_v',
-                startOpened: true,
-                noCaret: true,
-                category: 'tertiary',
-                size: 'small',
-                items,
-              },
-            }),
-        });
-      }
+      // eslint-disable-next-line no-new
+      new Vue({
+        el: Vue.version.startsWith('2') ? button : menuContainer,
+        name: 'GlDisclosureDropdown',
+        render(h) {
+          return h(GlDisclosureDropdown, {
+            props: {
+              icon: 'ellipsis_v',
+              startOpened: true,
+              noCaret: true,
+              category: 'tertiary',
+              size: 'small',
+              items,
+            },
+            attrs: {
+              'data-options-toggle': true,
+            },
+          });
+        },
+      });
     },
   },
 };

app/assets/javascripts/search/results/components/app.vue

@@ -4,6 +4,7 @@ import { mapState } from 'vuex';
 import { __, s__ } from '~/locale';
 import getBlobSearchQuery from '~/search/graphql/blob_search_zoekt.query.graphql';
 import { parseBoolean } from '~/lib/utils/common_utils';
+import { logError } from '~/lib/logger';
 import { DEFAULT_FETCH_CHUNKS } from '../constants';
 import { RECEIVE_NAVIGATION_COUNT } from '../../store/mutation_types';
 import EmptyResult from './result_empty.vue';
@@ -30,7 +31,6 @@ export default {
     return {
       hasError: false,
       blobSearch: {},
-      hasResults: true,
     };
   },
   apollo: {
@@ -40,30 +40,40 @@ export default {
       },
       errorPolicy: 'none',
       variables() {
-        return {
-          search: this.query.search,
-          groupId: this.query.group_id && `gid://gitlab/Group/${this.query.group_id}`,
-          projectId: this.query.project_id && `gid://gitlab/Project/${this.query.project_id}`,
+        const variables = {
+          search: this.query.search || '',
           page: this.currentPage,
           chunkCount: DEFAULT_FETCH_CHUNKS,
-          regex: parseBoolean(this.query.regex),
-          includeArchived: parseBoolean(this.query.include_archived),
-          includeForked: parseBoolean(this.query.include_forked),
+          regex: parseBoolean(this.query?.regex),
+          includeArchived: parseBoolean(this.query?.include_archived),
+          includeForked: parseBoolean(this.query?.include_forked),
         };
+
+        if (this.query?.group_id) {
+          variables.groupId = `gid://gitlab/Group/${this.query.group_id}`;
+        }
+
+        if (this.query?.project_id) {
+          variables.projectId = `gid://gitlab/Project/${this.query.project_id}`;
+        }
+
+        return variables;
+      },
+      skip() {
+        return !this.query.search;
       },
       result({ data }) {
         this.hasError = false;
         this.blobSearch = data?.blobSearch;
-        this.hasResults = data?.blobSearch?.files?.length > 0;
         this.$store.commit(RECEIVE_NAVIGATION_COUNT, {
           key: 'blobs',
           count: data?.blobSearch?.matchCount.toString(),
         });
       },
       debounce: 500,
-      error() {
+      error(error) {
+        logError(error);
         this.hasError = true;
-        this.hasResults = false;
       },
     },
   },
@@ -75,6 +85,9 @@ export default {
     isLoading() {
       return this.$apollo.queries.blobSearch.loading;
     },
+    hasResults() {
+      return this.blobSearch?.files?.length > 0;
+    },
   },
 };
 </script>
@@ -86,7 +99,7 @@ export default {
       <status-bar v-if="!isLoading" :blob-search="blobSearch" />
       <empty-result v-if="!hasResults && !isLoading" />
       <zoekt-blob-results
-        v-if="hasResults"
+        v-if="hasResults || isLoading"
         :blob-search="blobSearch"
         :has-results="hasResults"
         :is-loading="isLoading"

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -632,7 +632,6 @@ export default {
               v-if="!restrictedToolBarItems.includes('collapsible-section')"
               v-show="!previewMarkdown"
               :tag="mdCollapsibleSection"
-              :prepend="true"
               tag-select="Click to expand"
               :button-title="__('Add a collapsible section')"
               icon="details-block"

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

@@ -25,6 +25,10 @@
   z-index: 1;
 }
 
+.rd-diff-file-header:has([data-options-toggle] button[aria-expanded='true']) {
+  z-index: 10;
+}
+
 .rd-diff-file[data-collapsed] .rd-diff-file-header {
   border-radius: var(--rd-diff-file-border-radius);
 }

app/assets/stylesheets/page_bundles/settings.scss

@@ -166,12 +166,3 @@
   font-size: $default-icon-size;
   line-height: 42px;
 }
-
-.settings-message {
-  padding: 5px;
-  line-height: 1.3;
-  color: var(--gray-900, $gray-900);
-  background-color: var(--orange-50, $orange-50);
-  border: 1px solid var(--orange-200, $orange-200);
-  border-radius: $gl-border-radius-base;
-}