Commit eeb119ff authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-v-safe-html-ancestor-tree' into 'master'

Switch to v-safe-html in ancestors_true.vue

See merge request gitlab-org/gitlab!69847
parents 7a04bdbb 0000166e
<script> <script>
import { GlLoadingIcon, GlLink, GlTooltip, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlLink, GlTooltip, GlIcon, GlSafeHtmlDirective } from '@gitlab/ui';
import { escape } from 'lodash'; import { escape } from 'lodash';
import { __ } from '~/locale'; import { __ } from '~/locale';
...@@ -12,6 +12,9 @@ export default { ...@@ -12,6 +12,9 @@ export default {
GlLink, GlLink,
GlTooltip, GlTooltip,
}, },
directives: {
SafeHtml: GlSafeHtmlDirective,
},
props: { props: {
ancestors: { ancestors: {
type: Array, type: Array,
...@@ -70,7 +73,7 @@ export default { ...@@ -70,7 +73,7 @@ export default {
</div> </div>
<gl-tooltip :target="() => $refs.sidebarIcon" placement="left" boundary="viewport"> <gl-tooltip :target="() => $refs.sidebarIcon" placement="left" boundary="viewport">
<span v-html="tooltipText /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html="tooltipText"></span>
</gl-tooltip> </gl-tooltip>
<div class="title hide-collapsed gl-mb-2">{{ __('Ancestors') }}</div> <div class="title hide-collapsed gl-mb-2">{{ __('Ancestors') }}</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