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
c5bceb10
Commit
c5bceb10
authored
Sep 02, 2020
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-html with v-safe-html in parallel_diff_table_row.vue
parent
4e0d6868
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
.../javascripts/diffs/components/parallel_diff_table_row.vue
+4
-4
No files found.
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @
c5bceb10
<
script
>
/* eslint-disable vue/no-v-html */
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
$
from
'
jquery
'
;
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlTooltipDirective
,
GlSafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
DiffTableCell
from
'
./diff_table_cell.vue
'
;
import
{
MATCH_LINE_TYPE
,
...
...
@@ -22,6 +21,7 @@ export default {
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
SafeHtml
,
},
props
:
{
fileHash
:
{
...
...
@@ -161,10 +161,10 @@ export default {
<td
:class=
"parallelViewLeftLineType"
class=
"line-coverage left-side"
></td>
<td
:id=
"line.left.line_code"
v-safe-html=
"line.left.rich_text"
:class=
"parallelViewLeftLineType"
class=
"line_content with-coverage parallel left-side"
@
mousedown=
"handleParallelLineMouseDown"
v-html=
"line.left.rich_text"
></td>
</
template
>
<
template
v-else
>
...
...
@@ -193,6 +193,7 @@ export default {
>
</td>
<td
:id=
"line.right.line_code"
v-safe-html=
"line.right.rich_text"
:class=
"[
line.right.type,
{
...
...
@@ -201,7 +202,6 @@ export default {
]"
class="line_content with-coverage parallel right-side"
@mousedown="handleParallelLineMouseDown"
v-html="line.right.rich_text"
>
</td>
</
template
>
<
template
v-else
>
...
...
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