Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 10 deletions

diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue
index 8202dec5f02..78e729b97da 100644
--- a/app/assets/javascripts/issues/show/components/description.vue
+++ b/app/assets/javascripts/issues/show/components/description.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlToast, GlTooltip, GlModalDirective } from '@gitlab/ui';
+import $ from 'jquery';
 import Sortable from 'sortablejs';
 import Vue from 'vue';
 import SafeHtml from '~/vue_shared/directives/safe_html';
@@ -300,19 +301,20 @@ export default {
 
     updateTaskStatusText() {
       const taskRegexMatches = this.taskStatus.match(/(\d+) of ((?!0)\d+)/);
-      const tasks = document.querySelector('.issuable-meta #task_status');
-      const tasksShort = document.querySelector('.issuable-meta #task_status_short');
-
-      if (!tasks || !tasksShort) return;
+      const $issuableHeader = $('.issuable-meta');
+      const $tasks = $('#task_status', $issuableHeader);
+      const $tasksShort = $('#task_status_short', $issuableHeader);
 
       if (taskRegexMatches) {
-        tasks.textContent = this.taskStatus;
-        tasksShort.textContent = `${taskRegexMatches[1]}/${taskRegexMatches[2]} checklist item${
-          taskRegexMatches[2] > 1 ? 's' : ''
-        }`;
+        $tasks.text(this.taskStatus);
+        $tasksShort.text(
+          `${taskRegexMatches[1]}/${taskRegexMatches[2]} checklist item${
+            taskRegexMatches[2] > 1 ? 's' : ''
+          }`,
+        );
       } else {
-        tasks.textContent = '';
-        tasksShort.textContent = '';
+        $tasks.text('');
+        $tasksShort.text('');
       }
     },
     renderTaskActions() {