Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -6,7 +6,7 @@ workflow:
 
 include:
   - local: .gitlab/ci/version.yml
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.21.0"
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.22.0"
     inputs:
       job_name: "e2e-test-report"
       job_stage: "report"
@@ -16,7 +16,7 @@ include:
       gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
       allure_job_name: "${QA_RUN_TYPE}"
   - project: gitlab-org/quality/pipeline-common
-    ref: 8.21.0
+    ref: 8.22.0
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/knapsack-report.yml

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

@@ -18,4 +18,4 @@ variables:
   # Retry failed specs in separate process
   QA_RETRY_FAILED_SPECS: "true"
   # helm chart ref used by test-on-cng pipeline
-  GITLAB_HELM_CHART_REF: "e7f459ab671d8fdaecddd34c739e3d53c498bae2"
+  GITLAB_HELM_CHART_REF: "3466c297acf5efa6de6bdfaa3c12b696041faa02"

app/assets/javascripts/merge_requests/components/reviewers/reviewer_drawer.vue

@@ -71,6 +71,7 @@ export default {
       :reviewers="reviewers"
       :loading-reviewers="loadingReviewers"
       @request-review="(params) => $emit('request-review', params)"
+      @remove-reviewer="(params) => $emit('remove-reviewer', params)"
     />
     <approval-rules-wrapper :reviewers="reviewers" />
   </gl-drawer>

app/assets/javascripts/merge_requests/components/reviewers/reviewers_container.vue

@@ -83,10 +83,12 @@ export default {
     </div>
     <uncollapsed-reviewer-list
       v-else-if="reviewers.length"
+      :is-editable="userPermissions.adminMergeRequest"
       :root-path="relativeUrlRoot"
       :users="reviewers"
       issuable-type="merge_request"
       @request-review="(params) => $emit('request-review', params)"
+      @remove-reviewer="(params) => $emit('remove-reviewer', params)"
     />
     <gl-empty-state v-else :svg-path="$options.noReviewersAssignedSvg" :svg-height="70">
       <template #description>

app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue

@@ -83,6 +83,7 @@ export default {
       <reviewer-drawer
         :open="drawerOpen"
         @request-review="(params) => $emit('request-review', params)"
+        @remove-reviewer="(data) => $emit('remove-reviewer', data)"
         @close="toggleDrawerOpen(false)"
       />
     </mounting-portal>

app/assets/javascripts/sidebar/components/reviewers/reviewers.vue

@@ -51,6 +51,9 @@ export default {
     requestReview(data) {
       this.$emit('request-review', data);
     },
+    removeReviewer(data) {
+      this.$emit('remove-reviewer', data);
+    },
   },
 };
 </script>
@@ -84,6 +87,7 @@ export default {
         :root-path="rootPath"
         :issuable-type="issuableType"
         @request-review="requestReview"
+        @remove-reviewer="removeReviewer"
       />
     </div>
   </div>

app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue

@@ -5,7 +5,7 @@ import Vue from 'vue';
 import { createAlert } from '~/alert';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { __ } from '~/locale';
-import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { isGid, getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { fetchUserCounts } from '~/super_sidebar/user_counts_fetch';
 import eventHub from '../../event_hub';
 import getMergeRequestReviewersQuery from '../../queries/get_merge_request_reviewers.query.graphql';
@@ -166,6 +166,17 @@ export default {
     requestReview(data) {
       this.mediator.requestReview(data);
     },
+    async removeReviewerById(event) {
+      const userId = isGid(event.userId) ? getIdFromGraphQLId(event.userId) : event.userId;
+      this.store.reviewers = this.store.reviewers.filter((user) => user.id !== userId);
+      try {
+        await this.saveReviewers();
+      } catch (error) {
+        createAlert(__('Unable to remove a reviewer at the moment, try again later'), { error });
+      } finally {
+        event.done();
+      }
+    },
   },
 };
 </script>
@@ -177,6 +188,7 @@ export default {
       :loading="isLoading"
       :editable="canUpdate"
       @request-review="requestReview"
+      @remove-reviewer="removeReviewerById"
     />
     <reviewers
       v-if="!initialLoading"
@@ -187,6 +199,7 @@ export default {
       class="gl-pt-2"
       @request-review="requestReview"
       @assign-self="reviewBySelf"
+      @remove-reviewer="removeReviewerById"
     />
   </div>
 </template>

app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue

@@ -38,6 +38,7 @@ const REVIEW_STATE_ICONS = {
 export default {
   i18n: {
     reRequestReview: __('Re-request review'),
+    removeReviewer: s__('MergeRequest|Remove reviewer'),
   },
   components: {
     GlButton,
@@ -61,6 +62,11 @@ export default {
       required: false,
       default: TYPE_ISSUE,
     },
+    isEditable: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -112,7 +118,13 @@ export default {
       this.loadingStates[userId] = LOADING_STATE;
       this.$emit('request-review', { userId, callback: this.requestReviewComplete });
     },
-
+    removeReviewer(userId) {
+      this.loadingStates[userId] = LOADING_STATE;
+      this.$emit('remove-reviewer', {
+        userId,
+        callback: () => this.requestRemovalComplete(userId),
+      });
+    },
     requestReviewComplete(userId, success) {
       if (success) {
         this.loadingStates[userId] = SUCCESS_STATE;
@@ -124,6 +136,9 @@ export default {
         this.loadingStates[userId] = null;
       }
     },
+    requestRemovalComplete(userId) {
+      delete this.loadingStates[userId];
+    },
     reviewStateIcon(user) {
       if (user.mergeRequestInteraction.approved) {
         return {
@@ -201,6 +216,20 @@ export default {
           data-testid="reviewer-state-icon"
         />
       </span>
+      <span v-if="isEditable" class="gl-inline-flex gl-h-6 gl-w-6">
+        <gl-button
+          v-gl-tooltip.top.viewport
+          :title="$options.i18n.removeReviewer"
+          :aria-label="$options.i18n.removeReviewer"
+          :loading="loadingStates[user.id] === $options.LOADING_STATE"
+          class="gl-float-right gl-ml-2 !gl-text-subtle"
+          size="small"
+          icon="close"
+          variant="link"
+          data-testid="remove-request-button"
+          @click="removeReviewer(user.id)"
+        />
+      </span>
     </div>
   </div>
 </template>

app/assets/javascripts/work_items/components/create_work_item.vue

@@ -510,6 +510,7 @@ export default {
                 class="js-assignee gl-mb-5"
                 :can-update="canUpdate"
                 :full-path="fullPath"
+                :is-group="isGroup"
                 :work-item-id="workItemId"
                 :assignees="workItemAssignees.assignees.nodes"
                 :participants="workItemParticipantNodes"
@@ -525,6 +526,7 @@ export default {
                 class="js-labels gl-mb-5"
                 :can-update="canUpdate"
                 :full-path="fullPath"
+                :is-group="isGroup"
                 :work-item-id="workItemId"
                 :work-item-iid="workItemIid"
                 :work-item-type="selectedWorkItemTypeName"

app/assets/javascripts/work_items/components/shared/work_item_token_input.vue

@@ -27,7 +27,6 @@ export default {
     GlAlert,
   },
   directives: { SafeHtml },
-  inject: ['isGroup'],
   props: {
     value: {
       type: Array,
@@ -38,6 +37,11 @@ export default {
       type: String,
       required: true,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     childrenType: {
       type: String,
       required: false,

app/assets/javascripts/work_items/components/work_item_assignees.vue

@@ -23,7 +23,6 @@ export default {
     UncollapsedAssigneeList,
   },
   mixins: [Tracking.mixin()],
-  inject: ['isGroup'],
   props: {
     fullPath: {
       type: String,
@@ -55,6 +54,11 @@ export default {
       required: false,
       default: false,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     participants: {
       type: Array,
       required: false,

app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue

@@ -60,6 +60,11 @@ export default {
       type: String,
       required: true,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     workItem: {
       type: Object,
       required: true,
@@ -185,6 +190,7 @@ export default {
         class="js-assignee gl-mb-5"
         :can-update="canUpdate"
         :full-path="fullPath"
+        :is-group="isGroup"
         :work-item-id="workItem.id"
         :assignees="workItemAssignees.assignees.nodes"
         :participants="workItemParticipants"
@@ -203,6 +209,7 @@ export default {
         class="js-labels gl-mb-5"
         :can-update="canUpdate"
         :full-path="fullPath"
+        :is-group="isGroup"
         :work-item-id="workItem.id"
         :work-item-iid="workItem.iid"
         :work-item-type="workItemType"
@@ -314,6 +321,7 @@ export default {
         :parent="workItemParent"
         :has-parent="hasParent"
         :group-path="groupPath"
+        :is-group="isGroup"
         @error="$emit('error', $event)"
       />
     </template>

app/assets/javascripts/work_items/components/work_item_detail.vue

@@ -7,7 +7,7 @@ import { s__ } from '~/locale';
 import { getParameterByName, updateHistory, setUrlParams } from '~/lib/utils/url_utility';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { TYPENAME_WORK_ITEM } from '~/graphql_shared/constants';
+import { TYPENAME_GROUP, TYPENAME_WORK_ITEM } from '~/graphql_shared/constants';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import { WORKSPACE_PROJECT } from '~/issues/constants';
 import {
@@ -252,6 +252,9 @@ export default {
     isDiscussionLocked() {
       return this.workItemNotes?.discussionLocked;
     },
+    isGroupWorkItem() {
+      return this.workItem.namespace?.id.includes(TYPENAME_GROUP);
+    },
     workItemsAlphaEnabled() {
       return this.glFeatures.workItemsAlpha;
     },
@@ -701,6 +704,7 @@ export default {
               <work-item-attributes-wrapper
                 :class="{ 'gl-top-3': isDrawer }"
                 :full-path="workItemFullPath"
+                :is-group="isGroupWorkItem"
                 :work-item="workItem"
                 :group-path="groupPath"
                 @error="updateError = $event"
@@ -718,6 +722,7 @@ export default {
             <work-item-tree
               v-if="showWorkItemTree"
               :full-path="workItemFullPath"
+              :is-group="isGroupWorkItem"
               :work-item-type="workItemType"
               :parent-work-item-type="workItem.workItemType.name"
               :work-item-id="workItem.id"
@@ -734,6 +739,7 @@ export default {
             />
             <work-item-relationships
               v-if="workItemLinkedItems"
+              :is-group="isGroupWorkItem"
               :work-item-id="workItem.id"
               :work-item-iid="workItemIid"
               :work-item-full-path="workItemFullPath"

app/assets/javascripts/work_items/components/work_item_labels.vue

@@ -33,12 +33,17 @@ export default {
     WorkItemSidebarDropdownWidget,
   },
   mixins: [Tracking.mixin()],
-  inject: ['canAdminLabel', 'isGroup', 'issuesListPath', 'labelsManagePath'],
+  inject: ['canAdminLabel', 'issuesListPath', 'labelsManagePath'],
   props: {
     fullPath: {
       type: String,
       required: true,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     workItemId: {
       type: String,
       required: true,

app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue

@@ -314,6 +314,7 @@ export default {
         data-testid="add-links-form"
         :full-path="fullPath"
         :full-name="workItem.namespace.fullName"
+        :is-group="false"
         :issuable-gid="issuableGid"
         :work-item-iid="iid"
         :children-ids="childrenIds"

app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue

@@ -36,12 +36,17 @@ export default {
     WorkItemProjectsListbox,
   },
   mixins: [glFeatureFlagsMixin()],
-  inject: ['hasIterationsFeature', 'isGroup'],
+  inject: ['hasIterationsFeature'],
   props: {
     fullPath: {
       type: String,
       required: true,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     issuableGid: {
       type: String,
       required: false,
@@ -450,6 +455,7 @@ export default {
       <work-item-token-input
         v-model="workItemsToAdd"
         :is-create-form="isCreateForm"
+        :is-group="isGroup"
         :parent-work-item-id="issuableGid"
         :children-type="childrenType"
         :children-ids="childrenIds"

app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue

@@ -44,6 +44,11 @@ export default {
       type: String,
       required: true,
     },
+    isGroup: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     workItemType: {
       type: String,
       required: true,
@@ -292,6 +297,7 @@ export default {
         data-testid="add-tree-form"
         :full-path="fullPath"
         :full-name="workItemNamespaceName"
+        :is-group="isGroup"
         :issuable-gid="workItemId"
         :work-item-iid="workItemIid"
         :form-type="formType"