Commit 049c81e9 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch '299982-Remove-v-html-from-mr_widget_pipeline.vue' into 'master'

Remove v-html from mr_widget_pipeline.vue

See merge request gitlab-org/gitlab!52564
parents 47a42166 c07e036f
<script> <script>
/* eslint-disable vue/require-default-prop, vue/no-v-html */ /* eslint-disable vue/require-default-prop */
import { import {
GlIcon, GlIcon,
GlLink, GlLink,
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
GlSprintf, GlSprintf,
GlTooltip, GlTooltip,
GlTooltipDirective, GlTooltipDirective,
GlSafeHtmlDirective,
} from '@gitlab/ui'; } from '@gitlab/ui';
import mrWidgetPipelineMixin from 'ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline'; import mrWidgetPipelineMixin from 'ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline';
import { s__, n__ } from '~/locale'; import { s__, n__ } from '~/locale';
...@@ -32,6 +33,7 @@ export default { ...@@ -32,6 +33,7 @@ export default {
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml: GlSafeHtmlDirective,
}, },
mixins: [mrWidgetPipelineMixin], mixins: [mrWidgetPipelineMixin],
props: { props: {
...@@ -201,10 +203,10 @@ export default { ...@@ -201,10 +203,10 @@ export default {
<template v-if="showSourceBranch"> <template v-if="showSourceBranch">
{{ s__('Pipeline|on') }} {{ s__('Pipeline|on') }}
<tooltip-on-truncate <tooltip-on-truncate
v-safe-html="sourceBranchLink"
:title="sourceBranch" :title="sourceBranch"
truncate-target="child" truncate-target="child"
class="label-branch label-truncate gl-font-weight-normal" class="label-branch label-truncate gl-font-weight-normal"
v-html="sourceBranchLink"
/> />
</template> </template>
</div> </div>
......
---
title: Remove v-html from mr_widget_pipeline.vue
merge_request: 52564
author: Kev @KevSlashNull
type: other
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