Commit 1373a975 authored by Nathan Friend's avatar Nathan Friend

Merge branch...

Merge branch '241915-remove-v-html-from-app-assets-javascripts-notes-components-diff_discussion_header-vue' into 'master'

Replace v-html with v-safe-html in app/assets/javascripts/notes/components/diff_discussion_header.vue

Closes #241915

See merge request gitlab-org/gitlab!41518
parents 38b28e2f 6eb43343
<script>
/* eslint-disable vue/no-v-html */
import { mapActions } from 'vuex';
import { escape } from 'lodash';
import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { s__, __, sprintf } from '~/locale';
import { truncateSha } from '~/lib/utils/text_utility';
......@@ -17,6 +17,9 @@ export default {
noteEditedText,
noteHeader,
},
directives: {
SafeHtml,
},
props: {
discussion: {
type: Object,
......@@ -113,7 +116,7 @@ export default {
:expanded="discussion.expanded"
@toggleHandler="toggleDiscussionHandler"
>
<span v-html="headerText"></span>
<span v-safe-html="headerText"></span>
</note-header>
<note-edited-text
v-if="discussion.resolved"
......
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