Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/qa-common/main.gitlab-ci.yml

@@ -5,6 +5,7 @@ workflow:
   name: $PIPELINE_NAME
 
 include:
+  - local: .gitlab/ci/version.yml
   - component: "gitlab.com/gitlab-org/quality/pipeline-common/[email protected]"
     inputs:
       job_name: "e2e-test-report"

.gitlab/ci/qa.gitlab-ci.yml

@@ -44,19 +44,6 @@
     QA_EXPORT_TEST_METRICS: "true" # Export test metrics directly to influxdb by default
   inherit:
     variables:
-      - BUILD_OS
-      - CHROME_VERSION
-      - DOCKER_VERSION
-      - GCLOUD_VERSION
-      - GIT_VERSION
-      - GO_VERSION
-      - HELM_VERSION
-      - KUBECTL_VERSION
-      - LFS_VERSION
-      - OS_VERSION
-      - RUBY_VERSION_DEFAULT
-      - RUBY_VERSION_NEXT
-      - RUBYGEMS_VERSION
       - REGISTRY_GROUP
       - REGISTRY_HOST
       - OMNIBUS_GITLAB_CACHE_UPDATE

.gitlab/ci/test-on-cng/main.gitlab-ci.yml

@@ -127,6 +127,7 @@ cng-instance:
   extends: .cng-test-parallel
   variables:
     DEPLOYMENT_TYPE: kind
+    EXTRA_DEPLOY_VALUES: --env COVERBAND_ENABLED=${COVERBAND_ENABLED}
   allow_failure: true
 
 # Test run against environment with minimum supported redis version defined in lib/system_check/app/redis_version_check.rb

GITALY_SERVER_VERSION

@@ -1 +1 @@
-da03e230032486c2fc2cbed95d78308eff2887c6
+59fa4aafcff242772b172d4497da394d64929775

Rakefile

@@ -21,5 +21,3 @@ Knapsack.load_tasks if defined?(Knapsack)
 
 require 'gitlab-dangerfiles'
 Gitlab::Dangerfiles.load_tasks
-
-require 'rainbow/ext/string'

app/assets/javascripts/ci/job_log_viewer/components/log_viewer_top_bar.vue

@@ -14,7 +14,7 @@ export default {
   <div
     class="job-log-viewer-top-bar gl-display-flex gl-align-items-center gl-justify-content-space-between"
   >
-    <div>{{ s__('Job|Full log viewer') }} <experiment-badge class="gl-display-inline" /></div>
+    <div>{{ s__('Job|Full log viewer') }} <experiment-badge class="gl-inline" /></div>
     <div>
       <gl-link href="https://gitlab.com/gitlab-org/gitlab/-/issues/454817" target="_blank">{{
         s__('Job|Feedback issue')

app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue

@@ -26,7 +26,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-inline gl-align-middle">
+  <div class="gl-inline gl-align-middle">
     <div
       v-for="stage in stages"
       :key="stage.name"

app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue

@@ -31,7 +31,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-display-inline gl-align-middle">
+  <div class="gl-inline gl-align-middle">
     <div
       v-for="stage in stages"
       :key="stage.id"

app/assets/javascripts/content_editor/components/toolbar_table_button.vue

@@ -115,7 +115,7 @@ export default {
               :ref="`table-${r}-${c}`"
               :class="{ 'active gl-bg-blue-50!': r <= rows && c <= cols }"
               :aria-label="getButtonLabel(r, c)"
-              class="table-creator-grid-item gl-display-inline gl-rounded-0! !gl-w-6 gl-h-6! gl-p-0!"
+              class="table-creator-grid-item gl-inline gl-rounded-0! !gl-w-6 gl-h-6! gl-p-0!"
               @mouseover="setRowsAndCols(r, c)"
               @focus="setRowsAndCols(r, c)"
               @click="insertTable()"

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

@@ -28,7 +28,12 @@ export default {
 </script>
 
 <template>
-  <gl-badge v-if="approvalCount" v-gl-tooltip="tooltipTitle" icon="check-circle" variant="success">
+  <gl-badge
+    v-if="approvalCount"
+    v-gl-tooltip.viewport.top="tooltipTitle"
+    icon="check-circle"
+    variant="success"
+  >
     {{ approvalCount }}
   </gl-badge>
   <gl-icon v-else name="dash" />

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

@@ -19,13 +19,18 @@ const REVIEW_STATE_ICONS = {
     name: 'comment-lines',
     class: 'gl-bg-blue-100 gl-text-blue-500',
   },
+  REVIEW_STARTED: {
+    name: 'comment-dots',
+    class: 'gl-bg-gray-100 gl-text-gray-500',
+  },
 };
 const USER_TOOLTIP_TITLES = {
-  ASSIGNEES: __('%{strongStart}%{you}%{strongEnd}%{break}Assigned to %{name}.'),
+  ASSIGNEES: __('%{strongStart}%{you}%{strongEnd}%{break}Assigned to %{name}'),
   REQUESTED_CHANGES: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} requested changes'),
   REVIEWED: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} left feedback'),
   APPROVED: __('%{strongStart}%{you}%{strongEnd}%{break}Approved by %{name}'),
   UNREVIEWED: __('%{strongStart}%{you}%{strongEnd}%{break}Review requested from %{name}'),
+  REVIEW_STARTED: __('%{strongStart}%{you}%{strongEnd}%{break}%{name} started a review'),
   default: __('%{strongStart}%{you}%{strongEnd}%{break}Review requested from %{name}'),
 };
 

app/assets/javascripts/pages/admin/application_settings/payload_downloader.js

@@ -19,7 +19,7 @@ export default class PayloadDownloader {
   }
 
   requestPayload() {
-    this.spinner.classList.add('gl-display-inline');
+    this.spinner.classList.add('gl-inline');
 
     return axios
       .get(this.trigger.dataset.endpoint, {
@@ -34,7 +34,7 @@ export default class PayloadDownloader {
         });
       })
       .finally(() => {
-        this.spinner.classList.remove('gl-display-inline');
+        this.spinner.classList.remove('gl-inline');
       });
   }
 

app/assets/javascripts/pages/admin/application_settings/payload_previewer.js

@@ -29,7 +29,7 @@ export default class PayloadPreviewer {
   requestPayload() {
     if (this.isInserted) return this.showPayload();
 
-    this.spinner.classList.add('gl-display-inline');
+    this.spinner.classList.add('gl-inline');
 
     const container = this.getContainer();
 
@@ -38,11 +38,11 @@ export default class PayloadPreviewer {
         responseType: 'text',
       })
       .then(({ data }) => {
-        this.spinner.classList.remove('gl-display-inline');
+        this.spinner.classList.remove('gl-inline');
         this.insertPayload(data);
       })
       .catch(() => {
-        this.spinner.classList.remove('gl-display-inline');
+        this.spinner.classList.remove('gl-inline');
         createAlert({
           message: __('Error fetching payload data.'),
         });

app/assets/javascripts/pages/import/history/components/import_history_app.vue

@@ -130,7 +130,7 @@ export default {
       class="gl-border-solid gl-border-gray-200 gl-border-0 gl-border-b-1 gl-display-flex gl-align-items-center"
     >
       <h1 class="gl-my-0 gl-py-4 gl-font-size-h1">
-        <img :src="assets.gitlabLogo" class="gl-w-6 gl-h-6 gl-mb-2 gl-display-inline gl-mr-2" />
+        <img :src="assets.gitlabLogo" class="gl-w-6 gl-h-6 gl-mb-2 gl-inline gl-mr-2" />
         {{ s__('BulkImport|Project import history') }}
       </h1>
     </div>

app/assets/javascripts/releases/components/app_edit_new.vue

@@ -11,10 +11,11 @@ import {
 // eslint-disable-next-line no-restricted-imports
 import { mapState, mapActions, mapGetters } from 'vuex';
 import { isSameOriginUrl, getParameterByName } from '~/lib/utils/url_utility';
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
 import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue';
 import { BACK_URL_PARAM } from '~/releases/constants';
 import { putCreateReleaseNotification } from '~/releases/release_notification_service';
+import PageHeading from '~/vue_shared/components/page_heading.vue';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import AssetLinksForm from './asset_links_form.vue';
 import ConfirmDeleteModal from './confirm_delete_modal.vue';
@@ -23,6 +24,7 @@ import TagField from './tag_field.vue';
 export default {
   name: 'ReleaseEditNewApp',
   components: {
+    PageHeading,
     GlFormCheckbox,
     GlFormInput,
     GlFormGroup,
@@ -69,6 +71,9 @@ export default {
       'isFetchingTagNotes',
     ]),
     ...mapGetters('editNew', ['isValid', 'formattedReleaseNotes']),
+    headingText() {
+      return this.isExistingRelease ? s__('Release|Edit release') : s__('Release|New release');
+    },
     showForm() {
       return Boolean(!this.isFetchingRelease && !this.fetchError && this.release);
     },
@@ -173,19 +178,24 @@ export default {
 </script>
 <template>
   <div class="gl-flex flex-column">
-    <p class="pt-3 js-subtitle-text">
-      <gl-sprintf
-        :message="
-          __(
-            'Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}1.0.0%{codeEnd}, %{codeStart}2.1.0-pre%{codeEnd}.',
-          )
-        "
-      >
-        <template #code="{ content }">
-          <code>{{ content }}</code>
-        </template>
-      </gl-sprintf>
-    </p>
+    <page-heading :heading="headingText">
+      <template #description>
+        <span class="js-subtitle-text">
+          <gl-sprintf
+            :message="
+              __(
+                'Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}1.0.0%{codeEnd}, %{codeStart}2.1.0-pre%{codeEnd}.',
+              )
+            "
+          >
+            <template #code="{ content }">
+              <code>{{ content }}</code>
+            </template>
+          </gl-sprintf>
+        </span>
+      </template>
+    </page-heading>
+
     <form v-if="showForm" class="js-quick-submit" @submit.prevent="submitForm">
       <tag-field />
       <gl-form-group