Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
index f82f4dd5012..477dd13db4f 100644
--- a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
+++ b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
@@ -1,6 +1,5 @@
 <script>
-/* eslint-disable vue/no-v-html */
-import { GlModal } from '@gitlab/ui';
+import { GlModal, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
 import trackUninstallButtonClickMixin from 'ee_else_ce/clusters/mixins/track_uninstall_button_click';
 import { sprintf, s__ } from '~/locale';
 import {
@@ -45,6 +44,9 @@ export default {
   components: {
     GlModal,
   },
+  directives: {
+    SafeHtml,
+  },
   mixins: [trackUninstallButtonClickMixin],
   props: {
     application: {
@@ -94,6 +96,6 @@ export default {
     :title="title"
     @ok="confirmUninstall()"
   >
-    {{ warningText }} <span v-html="customAppWarningText"></span>
+    {{ warningText }} <span v-safe-html="customAppWarningText"></span>
   </gl-modal>
 </template>