Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c07e036f
Commit
c07e036f
authored
Feb 12, 2021
by
Kev
Committed by
Miguel Rincon
Feb 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove v-html from mr_widget_pipeline.vue
parent
bb35cd31
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+4
-2
changelogs/unreleased/299982-Remove-v-html-from-mr_widget_pipeline-vue.yml
...ased/299982-Remove-v-html-from-mr_widget_pipeline-vue.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
c07e036f
<
script
>
/* eslint-disable vue/require-default-prop
, vue/no-v-html
*/
/* eslint-disable vue/require-default-prop */
import
{
GlIcon
,
GlLink
,
...
...
@@ -7,6 +7,7 @@ import {
GlSprintf
,
GlTooltip
,
GlTooltipDirective
,
GlSafeHtmlDirective
,
}
from
'
@gitlab/ui
'
;
import
mrWidgetPipelineMixin
from
'
ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline
'
;
import
{
s__
,
n__
}
from
'
~/locale
'
;
...
...
@@ -32,6 +33,7 @@ export default {
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
SafeHtml
:
GlSafeHtmlDirective
,
},
mixins
:
[
mrWidgetPipelineMixin
],
props
:
{
...
...
@@ -200,10 +202,10 @@ export default {
<
template
v-if=
"showSourceBranch"
>
{{
s__
(
'
Pipeline|on
'
)
}}
<tooltip-on-truncate
v-safe-html=
"sourceBranchLink"
:title=
"sourceBranch"
truncate-target=
"child"
class=
"label-branch label-truncate gl-font-weight-normal"
v-html=
"sourceBranchLink"
/>
</
template
>
</div>
...
...
changelogs/unreleased/299982-Remove-v-html-from-mr_widget_pipeline-vue.yml
0 → 100644
View file @
c07e036f
---
title
:
Remove v-html from mr_widget_pipeline.vue
merge_request
:
52564
author
:
Kev @KevSlashNull
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment