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
c444e304
Commit
c444e304
authored
Sep 09, 2021
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to v-safe-html in Status Modal
parent
9cbf90dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
...javascripts/set_status_modal/set_status_modal_wrapper.vue
+5
-2
No files found.
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
View file @
c444e304
...
...
@@ -7,6 +7,7 @@ import {
GlFormCheckbox
,
GlDropdown
,
GlDropdownItem
,
GlSafeHtmlDirective
,
}
from
'
@gitlab/ui
'
;
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
...
...
@@ -48,6 +49,7 @@ export default {
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
SafeHtml
:
GlSafeHtmlDirective
,
},
mixins
:
[
glFeatureFlagsMixin
()],
props
:
{
...
...
@@ -233,6 +235,7 @@ export default {
},
},
statusTimeRanges
,
safeHtmlConfig
:
{
ADD_TAGS
:
[
'
gl-emoji
'
]
},
};
</
script
>
...
...
@@ -266,7 +269,7 @@ export default {
@
click=
"setEmoji"
>
<template
#button-content
>
<span
v-
html=
"emojiTag /* eslint-disable-line vue/no-v-html */
"
></span>
<span
v-
safe-html:
[$
options.safeHtmlConfig]=
"emojiTag
"
></span>
<span
v-show=
"noEmoji"
class=
"js-no-emoji-placeholder no-emoji-placeholder position-relative"
...
...
@@ -288,7 +291,7 @@ export default {
class=
"js-toggle-emoji-menu emoji-menu-toggle-button btn"
@
click=
"showEmojiMenu"
>
<span
v-
html=
"emojiTag /* eslint-disable-line vue/no-v-html */
"
></span>
<span
v-
safe-html:
[$
options.safeHtmlConfig]=
"emojiTag
"
></span>
<span
v-show=
"noEmoji"
class=
"js-no-emoji-placeholder no-emoji-placeholder position-relative"
...
...
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