Commit 1212e598 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '241917-remove-v-html-from-ee-app-assets-javascripts-license_compliance-components-pipeline_info-vue' into 'master'

Remove v-html from ee/app/assets/javascripts/license_compliance/components/pipeline_info.vue

Closes #241917

See merge request gitlab-org/gitlab!41516
parents 0a05f8a0 86b08fcf
<script> <script>
/* eslint-disable vue/no-v-html */
import { escape } from 'lodash'; import { escape } from 'lodash';
import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
...@@ -9,6 +9,9 @@ export default { ...@@ -9,6 +9,9 @@ export default {
components: { components: {
TimeAgoTooltip, TimeAgoTooltip,
}, },
directives: {
SafeHtml,
},
props: { props: {
path: { path: {
required: true, required: true,
...@@ -42,10 +45,10 @@ export default { ...@@ -42,10 +45,10 @@ export default {
<template> <template>
<span v-if="hasFullPipelineText"> <span v-if="hasFullPipelineText">
<span v-html="pipelineText"></span> <span v-safe-html="pipelineText"></span>
<span></span> <span></span>
<time-ago-tooltip :time="timestamp" /> <time-ago-tooltip :time="timestamp" />
</span> </span>
<span v-else v-html="pipelineText"></span> <span v-else v-safe-html="pipelineText"></span>
</template> </template>
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