Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 4 deletions

diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index ae728d834e2..c8130c47f5b 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlSafeHtmlDirective } from '@gitlab/ui';
+import { GlButton, GlSafeHtmlDirective, GlBadge } from '@gitlab/ui';
 import { mapActions, mapGetters, mapState } from 'vuex';
 import NoteableNote from '~/notes/components/noteable_note.vue';
 import PublishButton from './publish_button.vue';
@@ -9,6 +9,7 @@ export default {
     NoteableNote,
     PublishButton,
     GlButton,
+    GlBadge,
   },
   directives: {
     SafeHtml: GlSafeHtmlDirective,
@@ -100,9 +101,7 @@ export default {
         @toggleResolveStatus="toggleResolveDiscussion(draft.id)"
       >
         <template #note-header-info>
-          <strong class="badge draft-pending-label gl-mr-2">
-            {{ __('Pending') }}
-          </strong>
+          <gl-badge variant="warning" class="gl-mr-2">{{ __('Pending') }}</gl-badge>
         </template>
       </noteable-note>
     </ul>