Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/release-environments/security.gitlab-ci.yml

@@ -103,6 +103,7 @@ release-environments-qa:
     - echo "$CI_REGISTRY_PASSWORD" | docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" --password-stdin
   retry:
     max: 2
+    when: always
 
 release-environments-notification-failure:
   stage: finish

CHANGELOG.md

@@ -1335,7 +1335,7 @@ entry.
 - [Add UserStarredProjectsResolver sort argument](https://gitlab.com/gitlab-org/gitlab/-/commit/077ca496eaadc0a9383a552ed32294233de2f7e7) by @jzeng88 ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153651))
 - [Migrates gl-display-inline-flex to gl-inline-flex](https://gitlab.com/gitlab-org/gitlab/-/commit/3aa4f990bde82a9c6fb59d7c726a02bddc693cea) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154887))
 - [Multiple frameworks labels](https://gitlab.com/gitlab-org/gitlab/-/commit/ca5a43e01aadde03cf32218f62f7e56eb5709f05) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156570)) **GitLab Enterprise Edition**
-- [Add permissions checking to AI impact dashboard](https://gitlab.com/gitlab-org/gitlab/-/commit/23bf0938f52424ec382ba745b57375234b769949) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156555)) **GitLab Enterprise Edition**
+- [Add permissions checking to AI Impact Dashboard](https://gitlab.com/gitlab-org/gitlab/-/commit/23bf0938f52424ec382ba745b57375234b769949) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156555)) **GitLab Enterprise Edition**
 - [Admin settings: Migrate security settings to use SettingsBlock](https://gitlab.com/gitlab-org/gitlab/-/commit/467df2db45835010a9b4210982fe662f2f30e8b4) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157043))
 - [Externalize strings on ldap_group_links](https://gitlab.com/gitlab-org/gitlab/-/commit/2fcc3e2fd12ea0c6813e7c88a1548c90cecf24e0) by @MAlvarez32 ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155271))
 - [Improve usability of environment folders](https://gitlab.com/gitlab-org/gitlab/-/commit/076d3d3a212c3a93ec60863090c3a0fa185ecd05) by @antonkalmykov ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157104))
@@ -2246,7 +2246,7 @@ entry.
 - [Rate limit project / group notifications per user](gitlab-org/gitlab@ea40bb22bfd028d687faeaaa6cf9734777decde0) ([merge request](gitlab-org/gitlab!153786))
 - [Allow redirecting wiki directories on rename](gitlab-org/gitlab@8b9d3640355e73b9ed6196aeeafb923d3cb8f3be) ([merge request](gitlab-org/gitlab!153289))
 - [Add NOT NULL constraint to "path_locks.project_id"](gitlab-org/gitlab@8630330b599fcd0e15cc28680fac9b0c31c0ebea) ([merge request](gitlab-org/gitlab!153090))
-- [Add metric start date tooltip to AI impact dashboard](gitlab-org/gitlab@8999b334c8612b21a553c2b14d7ef342700854f4) ([merge request](gitlab-org/gitlab!153141)) **GitLab Enterprise Edition**
+- [Add metric start date tooltip to AI Impact Dashboard](gitlab-org/gitlab@8999b334c8612b21a553c2b14d7ef342700854f4) ([merge request](gitlab-org/gitlab!153141)) **GitLab Enterprise Edition**
 - [Create parent links for imported epics](gitlab-org/gitlab@d6132daae948ef8daada9fbbb37e0d98f7337040) ([merge request](gitlab-org/gitlab!154445))
 - [Migrate d-inline-block to gl-inline-block](gitlab-org/gitlab@cb06f5c91a046b7b86dda6793d4c3a6ceff3b6d7) ([merge request](gitlab-org/gitlab!152739))
 - [Docs(Epic Header): add entry to describe counts](gitlab-org/gitlab@494803b1a5ba348ce7ea43c0d94960e8ca6f68f1) ([merge request](gitlab-org/gitlab!154391)) **GitLab Enterprise Edition**
@@ -3175,7 +3175,7 @@ entry.
 - [Include template in deprecated flafinder-sast job](gitlab-org/gitlab@7bce91fd3639660b11b7669831f9ddc0d13bbe50) ([merge request](gitlab-org/gitlab!151298))
 - [Add AzureRM support to orphan artifacts cleanup](gitlab-org/gitlab@627eb5411af6f76a03c067131c7846c5c8d9129d) ([merge request](gitlab-org/gitlab!140497))
 - [Fix work item child status icon color](gitlab-org/gitlab@e5770bc16824362e06c73d56957255c5500f60c7) ([merge request](gitlab-org/gitlab!151094))
-- [Use locale-specific formatting for numbers in the AI Impact dashboard](gitlab-org/gitlab@07a2c3c576b7d0574c0d649ac7931d14606b5305) ([merge request](gitlab-org/gitlab!150882)) **GitLab Enterprise Edition**
+- [Use locale-specific formatting for numbers in the AI Impact Dashboard](gitlab-org/gitlab@07a2c3c576b7d0574c0d649ac7931d14606b5305) ([merge request](gitlab-org/gitlab!150882)) **GitLab Enterprise Edition**
 - [Allows ml_model pending destruction](gitlab-org/gitlab@4b3d7a7eaf03cb799fdd91781347bcafdd9fa040) ([merge request](gitlab-org/gitlab!150808))
 - [Fixes issue with registry search query params when removed](gitlab-org/gitlab@2f13fba9b1c405de37dc7b618f5472f129859989) ([merge request](gitlab-org/gitlab!150934))
 - [MR list: Fix overlapping search icon](gitlab-org/gitlab@7421cb36c6481acafb30435cb81695ff97bf6a3c) ([merge request](gitlab-org/gitlab!151045))

app/assets/javascripts/merge_request_dashboard/components/merge_request.vue

@@ -33,7 +33,7 @@ export default {
   },
   computed: {
     statsAriaLabel() {
-      const comments = n__('%d comment', '%d comments', this.mergeRequest.userDiscussionsCount);
+      const comments = n__('%d comment', '%d comments', this.mergeRequest.userNotesCount);
       const fileAdditions = n__(
         '%d file addition',
         '%d file additions',
@@ -109,7 +109,7 @@ export default {
       <div class="gl-flex gl-justify-end" :aria-label="statsAriaLabel">
         <div class="gl-whitespace-nowrap">
           <gl-icon name="comments" class="!gl-align-middle" />
-          {{ mergeRequest.userDiscussionsCount }}
+          {{ mergeRequest.userNotesCount }}
         </div>
         <div class="gl-ml-5 gl-whitespace-nowrap">
           <gl-icon name="doc-code" />

app/assets/javascripts/merge_request_dashboard/queries/merge_request.fragment.graphql

@@ -38,7 +38,7 @@ fragment MergeRequestDashboardFragment on MergeRequest {
       ...CiIcon
     }
   }
-  userDiscussionsCount
+  userNotesCount
   createdAt
   updatedAt
   ...MergeRequestApprovalFragment

app/assets/javascripts/search/index.js

@@ -13,7 +13,7 @@ const sidebarInitState = () => {
   const el = document.getElementById('js-search-sidebar');
   if (!el) return {};
 
-  const { navigationJson, searchType, searchLevel, groupInitialJson, projectInitialJson } =
+  const { navigationJson, searchType, searchLevel, groupInitialJson, projectInitialJson, ref } =
     el.dataset;
 
   const navigationJsonParsed = JSON.parse(navigationJson);
@@ -26,6 +26,7 @@ const sidebarInitState = () => {
     searchLevel,
     groupInitialJsonParsed,
     projectInitialJsonParsed,
+    ref,
   };
 };
 
@@ -49,6 +50,7 @@ export const initSearchApp = () => {
     searchLevel,
     groupInitialJsonParsed: groupInitialJson,
     projectInitialJsonParsed: projectInitialJson,
+    ref,
   } = sidebarInitState() || {};
 
   const { defaultBranchName } = topBarInitState() || {};
@@ -61,6 +63,7 @@ export const initSearchApp = () => {
     groupInitialJson,
     projectInitialJson,
     defaultBranchName,
+    repositoryRef: ref,
   });
 
   initTopbar(store);

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

@@ -1,33 +1,99 @@
 <script>
+import { GlAlert } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapState, mapGetters } from 'vuex';
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
+import getBlobSearchQuery from '~/search/graphql/blob_search_zoekt.query.graphql';
 import { SCOPE_BLOB, SEARCH_TYPE_ZOEKT } from '~/search/sidebar/constants/index';
-import ZoektBlobResults from '~/search/results/components/zoekt_blob_results.vue';
+import { DEFAULT_FETCH_CHUNKS } from '../constants';
+import StatusBar from './status_bar.vue';
+
+import ZoektBlobResults from './zoekt_blob_results.vue';
 
 export default {
   name: 'GlobalSearchResultsApp',
   i18n: {
     headerText: __('Search results'),
+    blobDataFetchError: s__(
+      'GlobalSearch|Could not load search results. Refresh the page to try again.',
+    ),
   },
   components: {
     ZoektBlobResults,
+    StatusBar,
+    GlAlert,
+  },
+  data() {
+    return {
+      hasError: false,
+      blobSearch: {},
+      hasResults: true,
+    };
+  },
+  apollo: {
+    blobSearch: {
+      query() {
+        return getBlobSearchQuery;
+      },
+      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}`,
+          page: this.currentPage,
+          chunkCount: DEFAULT_FETCH_CHUNKS,
+          regex: this.query.regex ? JSON.parse(this.query.regex) : false,
+        };
+      },
+      result({ data }) {
+        this.hasError = false;
+        this.blobSearch = data?.blobSearch;
+        this.hasResults = data?.blobSearch?.files?.length > 0;
+      },
+      debounce: 500,
+      error() {
+        this.hasError = true;
+        this.hasResults = false;
+      },
+    },
   },
   computed: {
-    ...mapState(['searchType']),
+    ...mapState(['searchType', 'query']),
     ...mapGetters(['currentScope']),
+    currentPage() {
+      return this.query?.page ? parseInt(this.query?.page, 10) : 1;
+    },
     isBlobScope() {
       return this.currentScope === SCOPE_BLOB;
     },
     isZoektSearch() {
       return this.searchType === SEARCH_TYPE_ZOEKT;
     },
+    isLoading() {
+      return this.$apollo.queries.blobSearch.loading;
+    },
+  },
+  methods: {
+    clearErrors() {
+      this.hasError = false;
+    },
   },
 };
 </script>
 
 <template>
-  <section>
-    <zoekt-blob-results v-if="isBlobScope && isZoektSearch" />
-  </section>
+  <div>
+    <gl-alert v-if="hasError" variant="danger" @dismiss="clearErrors">
+      {{ $options.i18n.blobDataFetchError }}
+    </gl-alert>
+    <section v-else-if="isBlobScope && isZoektSearch">
+      <status-bar :blob-search="blobSearch" :has-results="hasResults" :is-loading="isLoading" />
+      <zoekt-blob-results
+        :blob-search="blobSearch"
+        :has-results="hasResults"
+        :is-loading="isLoading"
+      />
+    </section>
+  </div>
 </template>

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

@@ -51,7 +51,7 @@ export default {
     <div
       v-for="(chunk, index) in chunksToShow(file)"
       :key="`chunk${index}`"
-      class="chunks-block gl-border-slate-400 gl-border-b last:gl-border-0"
+      class="chunks-block gl-border-b gl-border-subtle last:gl-border-0"
     >
       <blob-chunks :chunk="chunk" :blame-link="file.blameUrl" :file-url="file.fileUrl" />
     </div>

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

@@ -1,6 +1,7 @@
 <script>
 import { GlTooltipDirective, GlIcon, GlLink } from '@gitlab/ui';
 import GlSafeHtmlDirective from '~/vue_shared/directives/safe_html';
+import { s__ } from '~/locale';
 
 export default {
   name: 'BlobChunks',
@@ -12,6 +13,10 @@ export default {
     GlTooltip: GlTooltipDirective,
     SafeHtml: GlSafeHtmlDirective,
   },
+  i18n: {
+    viewBlame: s__('GlobalSearch|View blame'),
+    viewLine: s__('GlobalSearch|View line in repository'),
+  },
   props: {
     chunk: {
       type: Object,
@@ -56,24 +61,26 @@ export default {
               <gl-link
                 v-gl-tooltip
                 :href="`${blameLink}#L${line.lineNumber}`"
-                :title="__('View blame')"
+                :title="$options.i18n.viewBlame"
                 class="js-navigation-open"
                 ><gl-icon name="git"
               /></gl-link>
             </span>
-            <span class="diff-line-num flex-grow-1 gl-pr-3">
+            <span class="diff-line-num gl-grow gl-pr-3">
               <gl-link
                 v-gl-tooltip
                 :href="`${fileUrl}#L${line.lineNumber}`"
-                :title="__('View Line in repository')"
+                :title="$options.i18n.viewLine"
                 class="!gl-flex gl-items-center gl-justify-end"
                 >{{ line.lineNumber }}</gl-link
               >
             </span>
           </div>
         </div>
-        <pre class="code highlight flex-grow-1" data-testid="search-blob-line-code">
-          <span v-safe-html="highlightedRichText(line.richText)"></span>
+        <pre class="code highlight gl-grow" data-testid="search-blob-line-code">
+          <code class="!gl-inline">
+            <span v-safe-html="highlightedRichText(line.richText)" class="line"></span>
+          </code>
         </pre>
       </div>
     </div>

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

@@ -1,4 +1,5 @@
 <script>
+import { GlLink } from '@gitlab/ui';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import { s__ } from '~/locale';
@@ -8,6 +9,7 @@ export default {
   components: {
     FileIcon,
     ClipboardButton,
+    GlLink,
   },
   props: {
     filePath: {
@@ -39,15 +41,15 @@ export default {
   <div class="file-header-content gl-flex gl-items-center gl-leading-1">
     <file-icon :file-name="filePath" :size="16" aria-hidden="true" css-classes="gl-mr-3" />
 
-    <a :href="fileUrl" :title="$options.i18n.fileLink">
+    <gl-link :href="fileUrl" :title="$options.i18n.fileLink">
       <template v-if="projectPath">
         <strong class="project-path-content" data-testid="project-path-content"
           >{{ projectPath }}:
         </strong>
       </template>
 
       <strong class="file-name-content" data-testid="file-name-content">{{ filePath }}</strong>
-    </a>
+    </gl-link>
     <clipboard-button
       :text="filePath"
       :gfm="gfmCopyText"