Commit 6ffef3da authored by Phil Hughes's avatar Phil Hughes

Merge branch 'djadmin-safe-html-blob-viewer' into 'master'

Add v-safe-html to blob simple viewer component

See merge request gitlab-org/gitlab!74295
parents 04978fb4 e756f66b
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlSafeHtmlDirective } from '@gitlab/ui';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { HIGHLIGHT_CLASS_NAME } from './constants'; import { HIGHLIGHT_CLASS_NAME } from './constants';
import ViewerMixin from './mixins'; import ViewerMixin from './mixins';
...@@ -9,6 +9,9 @@ export default { ...@@ -9,6 +9,9 @@ export default {
components: { components: {
GlIcon, GlIcon,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
mixins: [ViewerMixin, glFeatureFlagsMixin()], mixins: [ViewerMixin, glFeatureFlagsMixin()],
inject: ['blobHash'], inject: ['blobHash'],
data() { data() {
...@@ -65,7 +68,7 @@ export default { ...@@ -65,7 +68,7 @@ export default {
<div class="blob-content"> <div class="blob-content">
<pre <pre
class="code highlight" class="code highlight"
><code :data-blob-hash="blobHash" v-html="content /* eslint-disable-line vue/no-v-html */"></code></pre> ><code v-safe-html="content" :data-blob-hash="blobHash"></code></pre>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment