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
1354564a
Commit
1354564a
authored
Sep 02, 2020
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-html with v-safe-html in noteable_note.vue
parent
2d4d8022
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+5
-2
No files found.
app/assets/javascripts/notes/components/noteable_note.vue
View file @
1354564a
...
...
@@ -3,7 +3,7 @@
import
$
from
'
jquery
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
escape
}
from
'
lodash
'
;
import
{
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
GlSprintf
,
GlSafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
truncateSha
}
from
'
~/lib/utils/text_utility
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
...
...
@@ -35,6 +35,9 @@ export default {
NoteBody
,
TimelineEntryItem
,
},
directives
:
{
SafeHtml
,
},
mixins
:
[
noteable
,
resolvable
,
glFeatureFlagsMixin
()],
props
:
{
note
:
{
...
...
@@ -379,7 +382,7 @@ export default {
:is-confidential=
"note.confidential"
>
<slot
slot=
"note-header-info"
name=
"note-header-info"
></slot>
<span
v-if=
"commit"
v-html=
"actionText"
></span>
<span
v-if=
"commit"
v-
safe-
html=
"actionText"
></span>
<span
v-else-if=
"note.created_at"
class=
"d-none d-sm-inline"
>
·
</span>
</note-header>
<note-actions
...
...
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