Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -163,7 +163,7 @@ workflow:
 
 variables:
   PG_VERSION: "14"
-  DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-18.17-postgresql-${PG_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
+  DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-${NODE_VERSION}-postgresql-${PG_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
   # We set $GITLAB_DEPENDENCY_PROXY to another variable (since it's set at the group level and has higher precedence than .gitlab-ci.yml)
   # so that we can override $GITLAB_DEPENDENCY_PROXY_ADDRESS in workflow rules.
   GITLAB_DEPENDENCY_PROXY_ADDRESS: "${GITLAB_DEPENDENCY_PROXY}"
@@ -188,7 +188,8 @@ variables:
   DOCKER_VERSION: "24.0.5"
   RUBYGEMS_VERSION: "3.4"
   BUNDLER_VERSION: "2.5"
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.21"
+  NODE_VERSION: "20.12"
   RUST_VERSION: "1.73"
 
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec/flaky/report-suite.json

.gitlab/ci/frontend.gitlab-ci.yml

@@ -3,7 +3,7 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-node-18.17:rubygems-${RUBYGEMS_VERSION}-git-2.33-lfs-2.9-yarn-1.22-graphicsmagick-1.3.36
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.33-lfs-2.9-yarn-1.22-graphicsmagick-1.3.36
   variables:
     SETUP_DB: "false"
     WEBPACK_VENDOR_DLL: "true"

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

@@ -427,6 +427,7 @@
   - "{,jh/}Gemfile{,.lock}"
   - "{package.json,yarn.lock}"
   - "*_VERSION"
+  - "lib/gitlab/redis/*"
   - "babel.config.js"
   - "config.ru"
   - "Dockerfile.assets"

.nvmrc

@@ -1 +1 @@
-18.17.0
+20.12.2

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1635,7 +1635,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/workers/licenses/reset_submit_license_usage_data_banner_worker.rb'
     - 'ee/app/workers/llm/embedding/gitlab_documentation/cleanup_previous_versions_records_worker.rb'
     - 'ee/app/workers/llm/embedding/gitlab_documentation/create_db_embeddings_per_doc_file_worker.rb'
-    - 'ee/app/workers/llm/embedding/gitlab_documentation/create_empty_embeddings_records_worker.rb'
     - 'ee/app/workers/llm/embedding/gitlab_documentation/set_embeddings_on_the_record_worker.rb'
     - 'ee/app/workers/members_destroyer/clean_up_group_protected_branch_rules_worker.rb'
     - 'ee/app/workers/merge_request_reset_approvals_worker.rb'

Gemfile.checksum

@@ -454,7 +454,7 @@
 {"name":"pact","version":"1.64.0","platform":"ruby","checksum":"0bdd848888580db7f29a7d8789b861b8067370c0ac0eb36ffc4bb7ff3f5f6ea8"},
 {"name":"pact-mock_service","version":"3.11.2","platform":"ruby","checksum":"42d9e54546a10229d7915da5383daeb322764c2876a84b4ea521f53c6f1fba51"},
 {"name":"pact-support","version":"1.20.0","platform":"ruby","checksum":"41c343a3124fb379684b9ad9f1a0766c5fa18d3b78d433a52e5552d8b9475871"},
-{"name":"parallel","version":"1.22.1","platform":"ruby","checksum":"ebdf1f0c51f182df38522f70ba770214940bef998cdb6e00f36492b29699761f"},
+{"name":"parallel","version":"1.24.0","platform":"ruby","checksum":"5bf38efb9b37865f8e93d7a762727f8c5fc5deb19949f4040c76481d5eee9397"},
 {"name":"parser","version":"3.3.0.5","platform":"ruby","checksum":"7748313e505ca87045dc0465c776c802043f777581796eb79b1654c5d19d2687"},
 {"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"},
 {"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"},

Gemfile.lock

@@ -1265,7 +1265,7 @@ GEM
       diff-lcs (~> 1.5)
       expgen (~> 0.1)
       rainbow (~> 3.1.1)
-    parallel (1.22.1)
+    parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc

app/assets/images/bot_avatars/security-bot.png

@@ -9,12 +9,12 @@ export const SCOPE = {
 };
 
 export const VerificationLevel = {
-  GITLAB: {
+  GITLAB_MAINTAINED: {
     badgeText: s__('CiCatalog|GitLab-maintained'),
     icon: 'tanuki-verified',
     popoverText: s__('CiCatalog|Created and maintained by %{boldStart}GitLab%{boldEnd}'),
   },
-  PARTNER: {
+  GITLAB_PARTNER_MAINTAINED: {
     badgeText: s__('CiCatalog|Partner'),
     icon: 'partner-verified',
     popoverText: s__('CiCatalog|Created and maintained by a %{boldStart}GitLab Partner%{boldEnd}'),

app/assets/images/bot_avatars/security-bot_120.png

@@ -119,19 +119,16 @@ export default {
   <gl-button
     :id="`js-ci-action-${link}`"
     ref="button"
+    v-gl-tooltip.viewport.right
+    :title="tooltipText"
     :class="cssClass"
     :disabled="isDisabled"
     size="small"
     class="js-ci-action gl-ci-action-icon-container ci-action-icon-container ci-action-icon-wrapper gl-display-flex gl-align-items-center gl-justify-content-center"
     data-testid="ci-action-button"
     @click.stop="onClickAction"
   >
-    <div
-      v-gl-tooltip.viewport
-      :title="tooltipText"
-      class="gl-display-flex gl-align-items-center gl-justify-content-center gl-h-full"
-      data-testid="ci-action-icon-tooltip-wrapper"
-    >
+    <div class="gl-display-flex gl-align-items-center gl-justify-content-center gl-h-full">
       <gl-loading-icon
         v-if="isLoading"
         size="sm"

app/assets/images/bot_avatars/security-bot_16.png

@@ -1,5 +1,5 @@
 <script>
-import { GlDisclosureDropdown, GlDisclosureDropdownItem } from '@gitlab/ui';
+import { GlDisclosureDropdown, GlDisclosureDropdownItem, GlTooltipDirective } from '@gitlab/ui';
 import { reportToSentry } from '~/ci/utils';
 import { JOB_DROPDOWN, SINGLE_JOB } from '../constants';
 import JobItem from './job_item.vue';
@@ -16,6 +16,9 @@ export default {
     GlDisclosureDropdown,
     GlDisclosureDropdownItem,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     group: {
       type: Object,
@@ -45,13 +48,22 @@ export default {
     computedJobId() {
       return this.pipelineId > -1 ? `${this.group.name}-${this.pipelineId}` : '';
     },
-    tooltipText() {
-      const { name, status } = this.group;
-      return `${name} - ${status.label}`;
-    },
     jobGroupClasses() {
       return [this.cssClassJobName, `job-${this.group.status.group}`];
     },
+    jobStatusText() {
+      const textBuilder = [];
+      const { tooltip: statusTooltip } = this.group.status;
+
+      if (statusTooltip) {
+        const statusText = statusTooltip.charAt(0).toUpperCase() + statusTooltip.slice(1);
+        textBuilder.push(statusText);
+      } else {
+        textBuilder.push(this.group.status?.text);
+      }
+
+      return textBuilder.join(' ');
+    },
   },
   errorCaptured(err, _vm, info) {
     reportToSentry('job_group_dropdown', `error: ${err}, info: ${info}`);
@@ -72,6 +84,8 @@ export default {
 <template>
   <gl-disclosure-dropdown
     :id="computedJobId"
+    v-gl-tooltip.viewport.left
+    :title="jobStatusText"
     class="ci-job-group-dropdown"
     block
     fluid-width
@@ -83,9 +97,9 @@ export default {
         <div class="gl-display-flex gl-align-items-stretch gl-justify-content-space-between">
           <job-item
             :type="$options.jobItemTypes.jobDropdown"
-            :group-tooltip="tooltipText"
             :job="group"
             :stage-name="stageName"
+            hide-tooltip
           />
 
           <div class="gl-font-weight-100 gl-font-size-lg gl-ml-n4 gl-align-self-center">

app/assets/images/bot_avatars/security-bot_160.png

@@ -80,10 +80,10 @@ export default {
       required: false,
       default: '',
     },
-    groupTooltip: {
-      type: String,
+    hideTooltip: {
+      type: Boolean,
       required: false,
-      default: '',
+      default: false,
     },
     jobHovered: {
       type: String,
@@ -182,31 +182,36 @@ export default {
       return this.hasDetails ? 'job-with-link' : 'job-without-link';
     },
     tooltipText() {
-      if (this.groupTooltip) {
-        return this.groupTooltip;
-      }
-
       const textBuilder = [];
       const { name: jobName } = this.job;
 
       if (jobName) {
         textBuilder.push(jobName);
       }
 
-      const { tooltip: statusTooltip } = this.status;
-      if (jobName && statusTooltip) {
-        textBuilder.push('-');
-      }
+      return textBuilder.join(' ');
+    },
+    jobStatusText() {
+      if (!this.hideTooltip) {
+        const textBuilder = [];
+        const { tooltip: statusTooltip } = this.status;
+
+        if (this.hasDetails && statusTooltip) {
+          const statusText = statusTooltip.charAt(0).toUpperCase() + statusTooltip.slice(1);
 
-      if (statusTooltip) {
-        if (this.isDelayedJob) {
-          textBuilder.push(sprintf(statusTooltip, { remainingTime: this.remainingTime }));
+          if (this.isDelayedJob) {
+            textBuilder.push(sprintf(statusText, { remainingTime: this.remainingTime }));
+          } else {
+            textBuilder.push(statusText);
+          }
         } else {
-          textBuilder.push(statusTooltip);
+          textBuilder.push(this.status?.text);
         }
+
+        return textBuilder.join(' ');
       }
 
-      return textBuilder.join(' ');
+      return null;
     },
     /**
      * Verifies if the provided job has an action path
@@ -318,12 +323,8 @@ export default {
   >
     <component
       :is="nameComponent"
-      v-gl-tooltip="{
-        boundary: 'viewport',
-        placement: 'bottom',
-        customClass: 'gl-pointer-events-none',
-      }"
-      :title="tooltipText"
+      v-gl-tooltip.viewport.left
+      :title="jobStatusText"
       :class="jobClasses"
       :href="detailsPath"
       class="js-pipeline-graph-job-link menu-item gl-text-gray-900 gl-active-text-decoration-none gl-focus-text-decoration-none gl-hover-text-decoration-none gl-hover-bg-gray-50 gl-focus-bg-gray-50 gl-w-full"
@@ -332,9 +333,12 @@ export default {
       @mouseout="hideTooltips"
     >
       <div class="gl-display-flex gl-align-items-center gl-flex-grow-1">
-        <ci-icon :status="job.status" :use-link="false" />
+        <ci-icon :status="job.status" :use-link="false" :show-tooltip="false" />
         <div class="gl-pl-3 gl-pr-3 gl-display-flex gl-flex-direction-column gl-pipeline-job-width">
-          <div class="gl-text-truncate gl-pr-9 gl-line-height-normal gl-text-left gl-text-gray-700">
+          <div
+            class="gl-text-truncate gl-pr-9 gl-line-height-normal gl-text-left gl-text-gray-700"
+            :title="tooltipText"
+          >
             {{ job.name }}
           </div>
           <div

app/assets/images/bot_avatars/security-bot_20.png

@@ -61,7 +61,7 @@ export default {
     <template v-if="editable">
       <gl-button
         v-tooltip.hover
-        :title="__('Quick assign')"
+        :title="glFeatures.reviewerAssignDrawer ? __('Quick assign') : __('Change reviewer')"
         class="js-sidebar-dropdown-toggle edit-link gl-ml-auto hide-collapsed gl-float-right"
         data-track-action="click_edit_button"
         data-track-label="right_sidebar"

app/assets/images/bot_avatars/security-bot_23.png

@@ -96,7 +96,7 @@ export default {
 </script>
 <template>
   <gl-badge
-    v-gl-tooltip
+    v-gl-tooltip.viewport.left
     class="ci-icon gl-p-2"
     :class="`ci-icon-variant-${variant}`"
     :variant="variant"

app/assets/images/bot_avatars/security-bot_24.png

@@ -1,4 +1,98 @@
 /* stylelint-disable scss/at-rule-no-unknown */
 
 @tailwind base;
+@tailwind components;
 @tailwind utilities;
+
+/*
+Components layer:
+https://tailwindcss.com/docs/adding-custom-styles#adding-component-classes
+
+The components layer will be rendered _before_ the utilities,
+so that utilities can overwrite values
+*/
+@layer components {
+    /*
+    our gl-border shorthands do a little more than tailwinds.
+    in order not to conflict with other border related properties
+    (color, width), we need to define them _before_ the tailwind utils.
+     */
+    .gl-border {
+        @apply gl-border-gray-100;
+        @apply gl-border-solid;
+    }
+
+    .gl-border\! {
+        @apply gl-border !important;
+        @apply gl-border-gray-100 !important;
+        @apply gl-border-solid !important;
+    }
+
+    .gl-border-b {
+        @apply gl-border-b-gray-100;
+        @apply gl-border-b-solid;
+    }
+
+    .gl-border-b\! {
+        @apply gl-border-b !important;
+        @apply gl-border-b-gray-100 !important;
+        @apply gl-border-b-solid !important;
+    }
+
+    .gl-border-l {
+        @apply gl-border-l-gray-100;
+        @apply gl-border-l-solid;
+    }
+
+    .gl-border-l\! {
+        @apply gl-border-l !important;
+        @apply gl-border-l-gray-100 !important;
+        @apply gl-border-l-solid !important;
+    }
+
+    .gl-border-r {
+        @apply gl-border-r-gray-100;
+        @apply gl-border-r-solid;
+    }
+
+    .gl-border-r\! {
+        @apply gl-border-r !important;
+        @apply gl-border-r-gray-100 !important;
+        @apply gl-border-r-solid !important;
+    }
+
+    .gl-border-t {
+        @apply gl-border-t-gray-100;
+        @apply gl-border-t-solid;
+    }
+
+    .gl-border-t\! {
+        @apply gl-border-t !important;
+        @apply gl-border-t-gray-100 !important;
+        @apply gl-border-t-solid !important;
+    }
+
+}
+
+/*
+Utilities layer:
+https://tailwindcss.com/docs/adding-custom-styles#adding-custom-utilities
+*/
+@layer utilities {
+    /* the border-style utils in tailwind do not allow for top, bottom, right, left specific values */
+    .gl-border-b-solid {
+        border-bottom-style: solid;
+    }
+
+    .gl-border-l-solid {
+        border-left-style: solid;
+    }
+
+    .gl-border-r-solid {
+        border-right-style: solid;
+    }
+
+    .gl-border-t-solid {
+        border-top-style: solid;
+    }
+}