Commit e4e03959 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'retry-vhtml-mrwidget' into 'master'

Remove v-html from MR widget links component

See merge request gitlab-org/gitlab!74696
parents 6d8b1d94 53983131
<script> <script>
import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { s__, n__ } from '~/locale'; import { s__, n__ } from '~/locale';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
export default { export default {
name: 'MRWidgetRelatedLinks', name: 'MRWidgetRelatedLinks',
directives: {
SafeHtml,
},
mixins: [glFeatureFlagMixin()], mixins: [glFeatureFlagMixin()],
props: { props: {
relatedLinks: { relatedLinks: {
...@@ -43,14 +47,14 @@ export default { ...@@ -43,14 +47,14 @@ export default {
:class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }" :class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }"
> >
{{ closesText }} {{ closesText }}
<span v-html="relatedLinks.closing /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html="relatedLinks.closing"></span>
</p> </p>
<p <p
v-if="relatedLinks.mentioned" v-if="relatedLinks.mentioned"
:class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }" :class="{ 'gl-display-line gl-m-0': glFeatures.restructuredMrWidget }"
> >
{{ n__('mrWidget|Mentions issue', 'mrWidget|Mentions issues', relatedLinks.mentionedCount) }} {{ n__('mrWidget|Mentions issue', 'mrWidget|Mentions issues', relatedLinks.mentionedCount) }}
<span v-html="relatedLinks.mentioned /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html="relatedLinks.mentioned"></span>
</p> </p>
<p <p
v-if="relatedLinks.assignToMe && showAssignToMe" v-if="relatedLinks.assignToMe && showAssignToMe"
......
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