diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-18 00:09:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-18 00:09:39 +0300 |
commit | 63b9a1e5bd6f67dd375e00c44eedf6a526f6653d (patch) | |
tree | 224c640358c560f6b827a3a7efff6df2d774bb70 /app/assets/javascripts/vue_shared/components/blob_viewers | |
parent | 708ee0bcb2c20cc73db53c092a26f916139d15d4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/blob_viewers')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue index fa9c860d05c..d0f5570db6b 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable vue/no-v-html */ +import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue'; import ViewerMixin from './mixins'; import { handleBlobRichViewer } from '~/blob/viewer'; @@ -8,6 +8,9 @@ export default { components: { MarkdownFieldView, }, + directives: { + SafeHtml, + }, mixins: [ViewerMixin], mounted() { handleBlobRichViewer(this.$refs.content, this.type); @@ -15,5 +18,5 @@ export default { }; </script> <template> - <markdown-field-view ref="content" v-html="content" /> + <markdown-field-view ref="content" v-safe-html="content" /> </template> |