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
03596974
Commit
03596974
authored
Nov 18, 2021
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to v-safe-html in diff_with_note.vue
parent
2393594c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+8
-6
No files found.
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
03596974
<
script
>
<
script
>
import
{
GlDeprecatedSkeletonLoading
as
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
{
GlDeprecatedSkeletonLoading
as
GlSkeletonLoading
,
GlSafeHtmlDirective
as
SafeHtml
,
}
from
'
@gitlab/ui
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
import
ImageDiffOverlay
from
'
~/diffs/components/image_diff_overlay.vue
'
;
import
ImageDiffOverlay
from
'
~/diffs/components/image_diff_overlay.vue
'
;
...
@@ -17,6 +20,9 @@ export default {
...
@@ -17,6 +20,9 @@ export default {
DiffViewer
,
DiffViewer
,
ImageDiffOverlay
,
ImageDiffOverlay
,
},
},
directives
:
{
SafeHtml
,
},
props
:
{
props
:
{
discussion
:
{
discussion
:
{
type
:
Object
,
type
:
Object
,
...
@@ -92,11 +98,7 @@ export default {
...
@@ -92,11 +98,7 @@ export default {
>
>
<td
:class=
"line.type"
class=
"diff-line-num old_line"
>
{{
line
.
old_line
}}
</td>
<td
:class=
"line.type"
class=
"diff-line-num old_line"
>
{{
line
.
old_line
}}
</td>
<td
:class=
"line.type"
class=
"diff-line-num new_line"
>
{{
line
.
new_line
}}
</td>
<td
:class=
"line.type"
class=
"diff-line-num new_line"
>
{{
line
.
new_line
}}
</td>
<td
<td
v-safe-html=
"trimChar(line.rich_text)"
:class=
"line.type"
class=
"line_content"
></td>
:class=
"line.type"
class=
"line_content"
v-html=
"trimChar(line.rich_text) /* eslint-disable-line vue/no-v-html */"
></td>
</tr>
</tr>
</
template
>
</
template
>
<tr
v-if=
"!hasTruncatedDiffLines"
class=
"line_holder line-holder-placeholder"
>
<tr
v-if=
"!hasTruncatedDiffLines"
class=
"line_holder line-holder-placeholder"
>
...
...
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