.gitlab/ci/review-apps/main.gitlab-ci.yml

@@ -65,6 +65,7 @@ review-deploy:
     - deploy || (display_deployment_debug && exit 1)
     - verify_deploy || exit 1
     - disable_sign_ups || (delete_release && exit 1)
+    - create_sample_projects
   after_script:
     # Run seed-dast-test-data.sh only when DAST_RUN is set to true. This is to pupulate review app with data for DAST scan.
     # Set DAST_RUN to true when jobs are manually scheduled.

.gitlab/merge_request_templates/Documentation.md

@@ -20,7 +20,6 @@
 
 If you are only adding documentation, do not add any of the following labels:
 
-- `~"type::feature"`
 - `~"frontend"`
 - `~"backend"`
 - `~"type::bug"`
@@ -44,5 +43,5 @@ Documentation-related MRs should be reviewed by a Technical Writer for a non-blo
 - [ ] Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review.
 - [ ] Ensure a release milestone is set.
 
-/label ~documentation
+/label ~documentation ~"type::maintenance"
 /assign me

.markdownlint.yml

 ---
 # Base Markdownlint configuration
 # Extended Markdownlint configuration in doc/.markdownlint/
-"default": true
-"first-header-h1": true
-"header-style":
-  "style": "atx"
-"ul-style":
-  "style": "dash"
-"no-trailing-spaces": false
-"line-length": false
-"no-duplicate-header":
-  "allow_different_nesting": true
-"no-trailing-punctuation":
-  "punctuation": ".,;:!。，；：！？"
-"ol-prefix":
-  "style": "one"
-"no-inline-html": false
-"hr-style":
-  "style": "---"
-"no-emphasis-as-heading": false
-"first-line-h1": false
-"code-block-style":
-  "style": "fenced"
-"proper-names":
-  "names": [
+default: true
+first-header-h1: true
+header-style:
+  style: "atx"
+ul-style:
+  style: "dash"
+no-trailing-spaces: false
+line-length: false
+no-duplicate-header:
+  allow_different_nesting: true
+no-trailing-punctuation:
+  punctuation: ".,;:!。，；：！？"
+ol-prefix:
+  style: "one"
+no-inline-html: false
+hr-style:
+  style: "---"
+no-emphasis-as-heading: false
+first-line-h1: false
+code-block-style:
+  style: "fenced"
+proper-names:
+  names: [
     "Akismet",
     "Alertmanager",
     "API",
@@ -139,4 +139,4 @@
     "YAML",
     "YouTrack"
   ]
-  "code_blocks": false
+  code_blocks: false

.rubocop_manual_todo.yml

@@ -2539,12 +2539,10 @@ Rails/IncludeUrlHelper:
     - 'ee/app/presenters/merge_request_approver_presenter.rb'
     - 'ee/spec/helpers/ee/projects/security/configuration_helper_spec.rb'
     - 'ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb'
-    - 'ee/spec/lib/banzai/filter/issuable_state_filter_spec.rb'
     - 'lib/gitlab/ci/badge/metadata.rb'
     - 'spec/helpers/merge_requests_helper_spec.rb'
     - 'spec/helpers/nav/top_nav_helper_spec.rb'
     - 'spec/helpers/notify_helper_spec.rb'
-    - 'spec/lib/banzai/filter/issuable_state_filter_spec.rb'
     - 'spec/lib/banzai/filter/reference_redactor_filter_spec.rb'
     - 'spec/lib/banzai/reference_redactor_spec.rb'
 

GITALY_SERVER_VERSION

-4e18794f846ad0d27bea3443caa2b51cd9afd722
+518670d57d1a6527aaf46b5b9bf5cb00f2e8f11b

GITLAB_SHELL_VERSION

-13.22.0
+13.22.1

app/assets/javascripts/blob/components/blob_content.vue

@@ -86,7 +86,7 @@ export default {
         :file-name="blob.name"
         :type="activeViewer.fileType"
         :hide-line-numbers="hideLineNumbers"
-        data-qa-selector="file_content"
+        data-qa-selector="blob_viewer_file_content"
       />
     </template>
   </div>

app/assets/javascripts/mr_popover/components/mr_popover.vue

@@ -100,13 +100,13 @@ export default {
           <div :class="`issuable-status-box status-box ${statusBoxClass}`">
             {{ stateHumanName }}
           </div>
-          <span class="text-secondary">Opened <time v-text="formattedTime"></time></span>
+          <span class="gl-text-secondary">Opened <time v-text="formattedTime"></time></span>
         </div>
         <ci-icon v-if="detailedStatus" :status="detailedStatus" />
       </div>
       <h5 v-if="!$apollo.queries.mergeRequest.loading" class="my-2">{{ title }}</h5>
       <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
-      <div class="text-secondary">
+      <div class="gl-text-secondary">
         {{ `${projectPath}!${mergeRequestIID}` }}
       </div>
       <!-- eslint-enable @gitlab/vue-require-i18n-strings -->

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

@@ -104,6 +104,10 @@ export default {
         });
       }
 
+      if (this.sortDirDesc) {
+        return skeletonNotes.concat(this.discussions);
+      }
+
       return this.discussions.concat(skeletonNotes);
     },
     canReply() {

app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue

 <script>
 import { GlButton, GlLink, GlSprintf, GlTooltipDirective, GlTruncate } from '@gitlab/ui';
-import { s__ } from '~/locale';
+import { s__, __ } from '~/locale';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import {
   PACKAGE_ERROR_STATUS,
@@ -64,6 +64,7 @@ export default {
   },
   i18n: {
     erroredPackageText: s__('PackageRegistry|Invalid Package: failed metadata extraction'),
+    createdAt: __('Created %{timestamp}'),
   },
 };
 </script>
@@ -127,8 +128,8 @@ export default {
     </template>
 
     <template #right-secondary>
-      <span>
-        <gl-sprintf :message="__('Created %{timestamp}')">
+      <span data-testid="created-date">
+        <gl-sprintf :message="$options.i18n.createdAt">
           <template #timestamp>
             <timeago-tooltip :time="packageEntity.createdAt" />
           </template>

app/assets/javascripts/packages_and_registries/package_registry/graphql/fragments/package_data.fragment.graphql

@@ -10,7 +10,7 @@ fragment PackageData on Package {
       name
     }
   }
-  pipelines {
+  pipelines(last: 1) {
     nodes {
       sha
       ref

app/assets/javascripts/pages/admin/services/edit/index.js

-import IntegrationSettingsForm from '~/integrations/integration_settings_form';
-
-const integrationSettingsForm = new IntegrationSettingsForm('.js-integration-settings-form');
-integrationSettingsForm.init();

app/assets/javascripts/pages/admin/services/index/index.js

-import PersistentUserCallout from '~/persistent_user_callout';
-
-const callout = document.querySelector('.js-service-templates-deprecated');
-PersistentUserCallout.factory(callout);

app/assets/javascripts/pipeline_editor/components/commit/commit_form.vue

@@ -73,7 +73,7 @@ export default {
       });
     },
     onReset() {
-      this.$emit('cancel');
+      this.$emit('resetContent');
     },
     scrollIntoView() {
       this.$el.scrollIntoView({ behavior: 'smooth' });
@@ -86,7 +86,7 @@ export default {
     startMergeRequest: __('Start a %{new_merge_request} with these changes'),
     newMergeRequest: __('new merge request'),
     commitChanges: __('Commit changes'),
-    cancel: __('Cancel'),
+    resetContent: __('Reset'),
   },
 };
 </script>
@@ -148,7 +148,7 @@ export default {
           {{ $options.i18n.commitChanges }}
         </gl-button>
         <gl-button type="reset" category="secondary" class="gl-mr-3">
-          {{ $options.i18n.cancel }}
+          {{ $options.i18n.resetContent }}
         </gl-button>
       </div>
     </gl-form>

app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue

@@ -127,9 +127,6 @@ export default {
         this.isSaving = false;
       }
     },
-    onCommitCancel() {
-      this.$emit('resetContent');
-    },
     updateCurrentBranch(currentBranch) {
       this.$apollo.mutate({
         mutation: updateCurrentBranchMutation,
@@ -153,7 +150,6 @@ export default {
     :is-saving="isSaving"
     :scroll-to-commit-form="scrollToCommitForm"
     v-on="$listeners"
-    @cancel="onCommitCancel"
     @submit="onCommitSubmit"
   />
 </template>

app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue

@@ -90,7 +90,7 @@ export default {
   <local-storage-sync v-model="isExpanded" :storage-key="$options.localDrawerKey" as-json>
     <aside
       aria-live="polite"
-      class="gl-fixed gl-right-0 gl-bg-gray-10 gl-shadow-drawer gl-transition-property-width gl-transition-duration-medium gl-border-l-solid gl-border-1 gl-border-gray-100 gl-h-full gl-z-index-3 gl-overflow-y-auto"
+      class="gl-fixed gl-right-0 gl-bg-gray-10 gl-shadow-drawer gl-transition-property-width gl-transition-duration-medium gl-border-l-solid gl-border-1 gl-border-gray-100 gl-h-full gl-z-index-200 gl-overflow-y-auto"
       :style="rootStyle"
     >
       <gl-button

app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue

 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlLoadingIcon, GlModal } from '@gitlab/ui';
 import { fetchPolicies } from '~/lib/graphql';
 import { queryToObject } from '~/lib/utils/url_utility';
-import { s__ } from '~/locale';
+import { __, s__ } from '~/locale';
 
 import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils';
 
@@ -30,6 +30,7 @@ export default {
   components: {
     ConfirmUnsavedChangesDialog,
     GlLoadingIcon,
+    GlModal,
     PipelineEditorEmptyState,
     PipelineEditorHome,
     PipelineEditorMessages,
@@ -54,6 +55,7 @@ export default {
       lastCommittedContent: '',
       shouldSkipStartScreen: false,
       showFailure: false,
+      showResetComfirmationModal: false,
       showStartScreen: false,
       showSuccess: false,
       starterTemplate: '',
@@ -224,6 +226,18 @@ export default {
     tabGraph: s__('Pipelines|Visualize'),
     tabLint: s__('Pipelines|Lint'),
   },
+  resetModal: {
+    actionPrimary: {
+      text: __('Reset file'),
+    },
+    actionCancel: {
+      text: __('Cancel'),
+    },
+    body: s__(
+      'Pipeline Editor|Are you sure you want to reset the file to its last committed version?',
+    ),
+    title: __('Discard changes'),
+  },
   watch: {
     isEmpty(flag) {
       if (flag) {
@@ -242,6 +256,11 @@ export default {
     hideSuccess() {
       this.showSuccess = false;
     },
+    confirmReset() {
+      if (this.hasUnsavedChanges) {
+        this.showResetComfirmationModal = true;
+      }
+    },
     async refetchContent() {
       this.$apollo.queries.initialCiFileContent.skip = false;
       await this.$apollo.queries.initialCiFileContent.refetch();
@@ -262,6 +281,7 @@ export default {
       this.successType = type;
     },
     resetContent() {
+      this.showResetComfirmationModal = false;
       this.currentCiFileContent = this.lastCommittedContent;
     },
     setAppStatus(appStatus) {
@@ -335,12 +355,22 @@ export default {
         :has-unsaved-changes="hasUnsavedChanges"
         :is-new-ci-config-file="isNewCiConfigFile"
         @commit="updateOnCommit"
-        @resetContent="resetContent"
+        @resetContent="confirmReset"
         @showError="showErrorAlert"
         @refetchContent="refetchContent"
         @updateCiConfig="updateCiConfig"
         @updateCommitSha="updateCommitSha"
       />
+      <gl-modal
+        v-model="showResetComfirmationModal"
+        modal-id="reset-content"
+        :title="$options.resetModal.title"
+        :action-cancel="$options.resetModal.actionCancel"
+        :action-primary="$options.resetModal.actionPrimary"
+        @primary="resetContent"
+      >
+        {{ $options.resetModal.body }}
+      </gl-modal>
       <confirm-unsaved-changes-dialog :has-unsaved-changes="hasUnsavedChanges" />
     </div>
   </div>

app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stage.vue

@@ -15,7 +15,7 @@
 import { GlDropdown, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
-import { __ } from '~/locale';
+import { __, sprintf } from '~/locale';
 import eventHub from '../../event_hub';
 import JobItem from './job_item.vue';
 
@@ -98,6 +98,9 @@ export default {
       // warn the pipelines table to update
       this.$emit('pipelineActionRequestComplete');
     },
+    stageAriaLabel(title) {
+      return sprintf(__('View Stage: %{title}'), { title });
+    },
   },
 };
 </script>
@@ -106,9 +109,10 @@ export default {
   <gl-dropdown
     ref="dropdown"
     v-gl-tooltip.hover.ds0
+    v-gl-tooltip="stage.title"
     data-testid="mini-pipeline-graph-dropdown"
-    :title="stage.title"
     variant="link"
+    :aria-label="stageAriaLabel(stage.title)"
     :lazy="true"
     :popper-opts="{ placement: 'bottom' }"
     :toggle-class="['mini-pipeline-graph-dropdown-toggle', triggerButtonClass]"

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue

 <script>
-import { GlButton, GlToggle, GlLoadingIcon, GlSprintf, GlFormInput, GlLink } from '@gitlab/ui';
+import {
+  GlButton,
+  GlToggle,
+  GlLoadingIcon,
+  GlSprintf,
+  GlFormInputGroup,
+  GlFormGroup,
+  GlFormInput,
+  GlLink,
+} from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { __ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -16,6 +25,8 @@ export default {
     GlLoadingIcon,
     GlSprintf,
     GlFormInput,
+    GlFormGroup,
+    GlFormInputGroup,
     GlLink,
     ServiceDeskTemplateDropdown,
   },
@@ -143,114 +154,122 @@ export default {
     </label>
     <div v-if="isEnabled" class="row mt-3">
       <div class="col-md-9 mb-0">
-        <strong
-          id="incoming-email-describer"
-          class="gl-display-block gl-mb-1"
-          data-testid="incoming-email-describer"
+        <gl-form-group
+          :label="__('Email address to use for Support Desk')"
+          label-for="incoming-email"
+          data-testid="incoming-email-label"
         >
-          {{ __('Email address to use for Support Desk') }}
-        </strong>
-        <template v-if="email">
-          <div class="input-group">
-            <input
+          <gl-form-input-group v-if="email">
+            <gl-form-input
+              id="incoming-email"
               ref="service-desk-incoming-email"
               type="text"
-              class="form-control"
               data-testid="incoming-email"
               :placeholder="__('Incoming email')"
               :aria-label="__('Incoming email')"
               aria-describedby="incoming-email-describer"
               :value="email"
-              disabled="true"
+              :disabled="true"
             />
-            <div class="input-group-append">
+            <template #append>
               <clipboard-button :title="__('Copy')" :text="email" css-class="input-group-text" />
-            </div>
-          </div>
-          <span v-if="hasCustomEmail" class="form-text text-muted">
-            <gl-sprintf :message="__('Emails sent to %{email} are also supported.')">
-              <template #email>
-                <code>{{ incomingEmail }}</code>
+            </template>
+          </gl-form-input-group>
+          <template v-if="email && hasCustomEmail" #description>
+            <span class="gl-mt-2 d-inline-block">
+              <gl-sprintf :message="__('Emails sent to %{email} are also supported.')">
+                <template #email>
+                  <code>{{ incomingEmail }}</code>
+                </template>
+              </gl-sprintf>
+            </span>
+          </template>
+          <template v-if="!email">
+            <gl-loading-icon size="sm" :inline="true" />
+            <span class="sr-only">{{ __('Fetching incoming email') }}</span>
+          </template>
+        </gl-form-group>
+
+        <gl-form-group :label="__('Email address suffix')" :state="!projectKeyError">
+          <gl-form-input
+            v-if="hasProjectKeySupport"
+            id="service-desk-project-suffix"
+            v-model.trim="projectKey"
+            data-testid="project-suffix"
+            @blur="validateProjectKey"
+          />
+
+          <template v-if="hasProjectKeySupport" #description>
+            <gl-sprintf
+              :message="
+                __('Add a suffix to Service Desk email address. %{linkStart}Learn more.%{linkEnd}')
+              "
+            >
+              <template #link="{ content }">
+                <gl-link
+                  :href="emailSuffixHelpUrl"
+                  target="_blank"
+                  class="gl-text-blue-600 font-size-inherit"
+                  >{{ content }}
+                </gl-link>
               </template>
             </gl-sprintf>
-          </span>
-        </template>
-        <template v-else>
-          <gl-loading-icon size="sm" :inline="true" />
-          <span class="sr-only">{{ __('Fetching incoming email') }}</span>
-        </template>
+          </template>
+          <template v-else #description>
+            <gl-sprintf
+              :message="
+                __(
+                  'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}',
+                )
+              "
+            >
+              <template #link="{ content }">
+                <gl-link
+                  :href="customEmailAddressHelpUrl"
+                  target="_blank"
+                  class="gl-text-blue-600 font-size-inherit"
+                  >{{ content }}
+                </gl-link>
+              </template>
+            </gl-sprintf>
+          </template>
+
+          <template v-if="hasProjectKeySupport && projectKeyError" #invalid-feedback>
+            {{ projectKeyError }}
+          </template>
+        </gl-form-group>
 
-        <label for="service-desk-project-suffix" class="mt-3">
-          {{ __('Email address suffix') }}
-        </label>
-        <gl-form-input
-          v-if="hasProjectKeySupport"
-          id="service-desk-project-suffix"
-          v-model.trim="projectKey"
-          data-testid="project-suffix"
-          class="form-control"
+        <gl-form-group
+          :label="__('Template to append to all Service Desk issues')"
           :state="!projectKeyError"
-          @blur="validateProjectKey"
-        />
-        <span v-if="hasProjectKeySupport && projectKeyError" class="form-text text-danger">
-          {{ projectKeyError }}
-        </span>
-        <span
-          v-if="hasProjectKeySupport"
-          class="form-text text-muted"
-          :class="{ 'gl-mt-2!': hasProjectKeySupport && projectKeyError }"
+          class="mt-3"
         >
-          <gl-sprintf
-            :message="
-              __('Add a suffix to Service Desk email address. %{linkStart}Learn more.%{linkEnd}')
-            "
-          >
-            <template #link="{ content }">
-              <gl-link
-                :href="emailSuffixHelpUrl"
-                target="_blank"
-                class="gl-text-blue-600 font-size-inherit"
-                >{{ content }}
-              </gl-link>
-            </template>
-          </gl-sprintf>
-        </span>
-        <span v-else class="form-text text-muted">
-          <gl-sprintf
-            :message="
-              __(
-                'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}',
-              )
-            "
-          >
-            <template #link="{ content }">
-              <gl-link
-                :href="customEmailAddressHelpUrl"
-                target="_blank"
-                class="gl-text-blue-600 font-size-inherit"
-                >{{ content }}
-              </gl-link>
-            </template>
-          </gl-sprintf>
-        </span>
+          <service-desk-template-dropdown
+            :selected-template="selectedTemplate"
+            :selected-file-template-project-id="selectedFileTemplateProjectId"
+            :templates="templates"
+            @change="templateChange"
+          />
+        </gl-form-group>
+
+        <gl-form-group
+          :label="__('Email display name')"
+          label-for="service-desk-email-from-name"
+          :state="!projectKeyError"
+          class="mt-3"
+        >
+          <gl-form-input
+            v-if="hasProjectKeySupport"
+            id="service-desk-email-from-name"
+            v-model.trim="outgoingName"
+            data-testid="email-from-name"
+          />
 
-        <label for="service-desk-template-select" class="mt-3">
-          {{ __('Template to append to all Service Desk issues') }}
-        </label>
-        <service-desk-template-dropdown
-          :selected-template="selectedTemplate"
-          :selected-file-template-project-id="selectedFileTemplateProjectId"
-          :templates="templates"
-          @change="templateChange"
-        />
+          <template v-if="hasProjectKeySupport" #description>
+            {{ __('Emails sent from Service Desk have this name.') }}
+          </template>
+        </gl-form-group>
 
-        <label for="service-desk-email-from-name" class="mt-3">
-          {{ __('Email display name') }}
-        </label>
-        <input id="service-desk-email-from-name" v-model.trim="outgoingName" class="form-control" />
-        <span class="form-text text-muted">
-          {{ __('Emails sent from Service Desk have this name.') }}
-        </span>
         <div class="gl-display-flex gl-justify-content-end">
           <gl-button
             variant="success"

app/assets/javascripts/repository/components/blob_button_group.vue

@@ -98,6 +98,7 @@ export default {
         :is-locked="isLocked"
         :can-lock="canLock"
         data-testid="lock"
+        data-qa-selector="lock_button"
       />
       <gl-button v-gl-modal="replaceModalId" data-testid="replace">
         {{ $options.i18n.replace }}