Add latest changes from gitlab-org/gitlab@master

6 files changed, 115 insertions, 93 deletions

diff --git a/app/assets/javascripts/issuable_list/components/issuable_item.vue b/app/assets/javascripts/issuable_list/components/issuable_item.vue
index 1ee794ab208..583e5cb703d 100644
--- a/app/assets/javascripts/issuable_list/components/issuable_item.vue
+++ b/app/assets/javascripts/issuable_list/components/issuable_item.vue
@@ -128,7 +128,7 @@ export default {
 
 <template>
   <li class="issue gl-px-5!">
-    <div class="issue-box">
+    <div class="issuable-info-container">
       <div v-if="showCheckbox" class="issue-check">
         <gl-form-checkbox
           class="gl-mr-0"
@@ -136,101 +136,99 @@ export default {
           @input="$emit('checked-input', $event)"
         />
       </div>
-      <div class="issuable-info-container">
-        <div class="issuable-main-info">
-          <div data-testid="issuable-title" class="issue-title title">
-            <span class="issue-title-text" dir="auto">
-              <gl-link :href="issuable.webUrl" v-bind="issuableTitleProps"
-                >{{ issuable.title
-                }}<gl-icon v-if="isIssuableUrlExternal" name="external-link" class="gl-ml-2"
-              /></gl-link>
-            </span>
-          </div>
-          <div class="issuable-info">
-            <slot v-if="hasSlotContents('reference')" name="reference"></slot>
-            <span v-else data-testid="issuable-reference" class="issuable-reference"
-              >{{ issuableSymbol }}{{ issuable.iid }}</span
-            >
-            <span class="issuable-authored d-none d-sm-inline-block">
-              &middot;
-              <span
-                v-gl-tooltip:tooltipcontainer.bottom
-                data-testid="issuable-created-at"
-                :title="tooltipTitle(issuable.createdAt)"
-                >{{ createdAt }}</span
-              >
-              {{ __('by') }}
-              <slot v-if="hasSlotContents('author')" name="author"></slot>
-              <gl-link
-                v-else
-                :data-user-id="authorId"
-                :data-username="author.username"
-                :data-name="author.name"
-                :data-avatar-url="author.avatarUrl"
-                :href="author.webUrl"
-                data-testid="issuable-author"
-                class="author-link js-user-link"
-              >
-                <span class="author">{{ author.name }}</span>
-              </gl-link>
-            </span>
-            <slot name="timeframe"></slot>
-            &nbsp;
-            <gl-label
-              v-for="(label, index) in labels"
-              :key="index"
-              :background-color="label.color"
-              :title="labelTitle(label)"
-              :description="label.description"
-              :scoped="scopedLabel(label)"
-              :target="labelTarget(label)"
-              :class="{ 'gl-ml-2': index }"
-              size="sm"
-            />
-          </div>
+      <div class="issuable-main-info">
+        <div data-testid="issuable-title" class="issue-title title">
+          <span class="issue-title-text" dir="auto">
+            <gl-link :href="issuable.webUrl" v-bind="issuableTitleProps"
+              >{{ issuable.title
+              }}<gl-icon v-if="isIssuableUrlExternal" name="external-link" class="gl-ml-2"
+            /></gl-link>
+          </span>
         </div>
-        <div class="issuable-meta">
-          <ul v-if="showIssuableMeta" class="controls">
-            <li v-if="hasSlotContents('status')" class="issuable-status">
-              <slot name="status"></slot>
-            </li>
-            <li
-              v-if="showDiscussions"
-              data-testid="issuable-discussions"
-              class="issuable-comments gl-display-none gl-display-sm-block"
-            >
-              <gl-link
-                v-gl-tooltip:tooltipcontainer.top
-                :title="__('Comments')"
-                :href="`${issuable.webUrl}#notes`"
-                :class="{ 'no-comments': !issuable.userDiscussionsCount }"
-                class="gl-reset-color!"
-              >
-                <gl-icon name="comments" />
-                {{ issuable.userDiscussionsCount }}
-              </gl-link>
-            </li>
-            <li v-if="assignees.length" class="gl-display-flex">
-              <issuable-assignees
-                :assignees="issuable.assignees"
-                :icon-size="16"
-                :max-visible="4"
-                img-css-classes="gl-mr-2!"
-                class="gl-align-items-center gl-display-flex gl-ml-3"
-              />
-            </li>
-          </ul>
-          <div
-            data-testid="issuable-updated-at"
-            class="float-right issuable-updated-at d-none d-sm-inline-block"
+        <div class="issuable-info">
+          <slot v-if="hasSlotContents('reference')" name="reference"></slot>
+          <span v-else data-testid="issuable-reference" class="issuable-reference"
+            >{{ issuableSymbol }}{{ issuable.iid }}</span
           >
+          <span class="issuable-authored d-none d-sm-inline-block">
+            &middot;
             <span
               v-gl-tooltip:tooltipcontainer.bottom
-              :title="tooltipTitle(issuable.updatedAt)"
-              class="issuable-updated-at"
-              >{{ updatedAt }}</span
+              data-testid="issuable-created-at"
+              :title="tooltipTitle(issuable.createdAt)"
+              >{{ createdAt }}</span
+            >
+            {{ __('by') }}
+            <slot v-if="hasSlotContents('author')" name="author"></slot>
+            <gl-link
+              v-else
+              :data-user-id="authorId"
+              :data-username="author.username"
+              :data-name="author.name"
+              :data-avatar-url="author.avatarUrl"
+              :href="author.webUrl"
+              data-testid="issuable-author"
+              class="author-link js-user-link"
+            >
+              <span class="author">{{ author.name }}</span>
+            </gl-link>
+          </span>
+          <slot name="timeframe"></slot>
+          &nbsp;
+          <gl-label
+            v-for="(label, index) in labels"
+            :key="index"
+            :background-color="label.color"
+            :title="labelTitle(label)"
+            :description="label.description"
+            :scoped="scopedLabel(label)"
+            :target="labelTarget(label)"
+            :class="{ 'gl-ml-2': index }"
+            size="sm"
+          />
+        </div>
+      </div>
+      <div class="issuable-meta">
+        <ul v-if="showIssuableMeta" class="controls">
+          <li v-if="hasSlotContents('status')" class="issuable-status">
+            <slot name="status"></slot>
+          </li>
+          <li
+            v-if="showDiscussions"
+            data-testid="issuable-discussions"
+            class="issuable-comments gl-display-none gl-display-sm-block"
+          >
+            <gl-link
+              v-gl-tooltip:tooltipcontainer.top
+              :title="__('Comments')"
+              :href="`${issuable.webUrl}#notes`"
+              :class="{ 'no-comments': !issuable.userDiscussionsCount }"
+              class="gl-reset-color!"
             >
-          </div>
+              <gl-icon name="comments" />
+              {{ issuable.userDiscussionsCount }}
+            </gl-link>
+          </li>
+          <li v-if="assignees.length" class="gl-display-flex">
+            <issuable-assignees
+              :assignees="issuable.assignees"
+              :icon-size="16"
+              :max-visible="4"
+              img-css-classes="gl-mr-2!"
+              class="gl-align-items-center gl-display-flex gl-ml-3"
+            />
+          </li>
+        </ul>
+        <div
+          data-testid="issuable-updated-at"
+          class="float-right issuable-updated-at d-none d-sm-inline-block"
+        >
+          <span
+            v-gl-tooltip:tooltipcontainer.bottom
+            :title="tooltipTitle(issuable.updatedAt)"
+            class="issuable-updated-at"
+            >{{ updatedAt }}</span
+          >
         </div>
       </div>
     </div>
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index 61e5db0970a..8acda4ada16 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -3,6 +3,7 @@ import { GlIcon, GlIntersectionObserver } from '@gitlab/ui';
 import Visibility from 'visibilityjs';
 import { __, s__, sprintf } from '~/locale';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
+import { sanitize } from '~/lib/dompurify';
 import { visitUrl } from '~/lib/utils/url_utility';
 import Poll from '~/lib/utils/poll';
 import eventHub from '../event_hub';
@@ -178,7 +179,7 @@ export default {
     const store = new Store({
       titleHtml: this.initialTitleHtml,
       titleText: this.initialTitleText,
-      descriptionHtml: this.initialDescriptionHtml,
+      descriptionHtml: sanitize(this.initialDescriptionHtml),
       descriptionText: this.initialDescriptionText,
       updatedAt: this.updatedAt,
       updatedByName: this.updatedByName,
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 2c60b5ee84a..ee668f4406f 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -435,6 +435,10 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
 };
 
 const pollSuccessCallBack = (resp, commit, state, getters, dispatch) => {
+  if (state.isResolvingDiscussion) {
+    return null;
+  }
+
   if (resp.notes?.length) {
     dispatch('updateOrCreateNotes', resp.notes);
     dispatch('startTaskList');
@@ -574,6 +578,9 @@ export const submitSuggestion = (
   const dispatchResolveDiscussion = () =>
     dispatch('resolveDiscussion', { discussionId }).catch(() => {});
 
+  commit(types.SET_RESOLVING_DISCUSSION, true);
+  dispatch('stopPolling');
+
   return Api.applySuggestion(suggestionId)
     .then(() => commit(types.APPLY_SUGGESTION, { discussionId, noteId, suggestionId }))
     .then(dispatchResolveDiscussion)
@@ -587,6 +594,10 @@ export const submitSuggestion = (
       const flashMessage = errorMessage || defaultMessage;
 
       Flash(__(flashMessage), 'alert', flashContainer);
+    })
+    .finally(() => {
+      commit(types.SET_RESOLVING_DISCUSSION, false);
+      dispatch('restartPolling');
     });
 };
 
@@ -605,6 +616,8 @@ export const submitSuggestionBatch = ({ commit, dispatch, state }, { flashContai
     });
 
   commit(types.SET_APPLYING_BATCH_STATE, true);
+  commit(types.SET_RESOLVING_DISCUSSION, true);
+  dispatch('stopPolling');
 
   return Api.applySuggestionBatch(suggestionIds)
     .then(() => Promise.all(applyAllSuggestions()))
@@ -621,7 +634,11 @@ export const submitSuggestionBatch = ({ commit, dispatch, state }, { flashContai
 
       Flash(__(flashMessage), 'alert', flashContainer);
     })
-    .finally(() => commit(types.SET_APPLYING_BATCH_STATE, false));
+    .finally(() => {
+      commit(types.SET_APPLYING_BATCH_STATE, false);
+      commit(types.SET_RESOLVING_DISCUSSION, false);
+      dispatch('restartPolling');
+    });
 };
 
 export const addSuggestionInfoToBatch = ({ commit }, { suggestionId, noteId, discussionId }) =>
diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js
index a8738fa7c5f..3194a2099ea 100644
--- a/app/assets/javascripts/notes/stores/modules/index.js
+++ b/app/assets/javascripts/notes/stores/modules/index.js
@@ -42,6 +42,7 @@ export default () => ({
       current_user: {},
       preview_note_path: 'path/to/preview',
     },
+    isResolvingDiscussion: false,
     commentsDisabled: false,
     resolvableDiscussionsCount: 0,
     unresolvedDiscussionsCount: 0,
diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/notes/stores/mutation_types.js
index 7496dd630f6..8270f2a225b 100644
--- a/app/assets/javascripts/notes/stores/mutation_types.js
+++ b/app/assets/javascripts/notes/stores/mutation_types.js
@@ -38,6 +38,7 @@ export const SET_TIMELINE_VIEW = 'SET_TIMELINE_VIEW';
 export const SET_SELECTED_COMMENT_POSITION = 'SET_SELECTED_COMMENT_POSITION';
 export const SET_SELECTED_COMMENT_POSITION_HOVER = 'SET_SELECTED_COMMENT_POSITION_HOVER';
 export const SET_FETCHING_DISCUSSIONS = 'SET_FETCHING_DISCUSSIONS';
+export const SET_RESOLVING_DISCUSSION = 'SET_RESOLVING_DISCUSSION';
 
 // Issue
 export const CLOSE_ISSUE = 'CLOSE_ISSUE';
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index 7cc619ec1c5..85bdf60e8f9 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -213,6 +213,10 @@ export default {
     }
   },
 
+  [types.SET_RESOLVING_DISCUSSION](state, isResolving) {
+    state.isResolvingDiscussion = isResolving;
+  },
+
   [types.UPDATE_NOTE](state, note) {
     const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);