diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 06:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-12 06:08:20 +0300 |
commit | db4ee69eb3df58ac9f109d64228d1468e4ff7962 (patch) | |
tree | 90af06a3756c516a2c16991e8fca517e45ce92d5 /app/assets/javascripts/clusters | |
parent | 447a64b1dcb0e56648cf4ae3eb3baf0864ce9987 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters')
-rw-r--r-- | app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue | 8 |
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> |