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
fef38630
Commit
fef38630
authored
Sep 09, 2021
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to v-safe-html in user_popover.vue
parent
5c2ac9ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
...ripts/vue_shared/components/user_popover/user_popover.vue
+6
-2
No files found.
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View file @
fef38630
<
script
>
import
{
GlPopover
,
GlLink
,
GlSkeletonLoader
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlPopover
,
GlLink
,
GlSkeletonLoader
,
GlIcon
,
GlSafeHtmlDirective
}
from
'
@gitlab/ui
'
;
import
UserNameWithStatus
from
'
~/sidebar/components/assignees/user_name_with_status.vue
'
;
import
{
glEmojiTag
}
from
'
../../../emoji
'
;
import
UserAvatarImage
from
'
../user_avatar/user_avatar_image.vue
'
;
...
...
@@ -17,6 +17,9 @@ export default {
UserAvatarImage
,
UserNameWithStatus
,
},
directives
:
{
SafeHtml
:
GlSafeHtmlDirective
,
},
props
:
{
target
:
{
type
:
HTMLElement
,
...
...
@@ -49,6 +52,7 @@ export default {
return
this
.
user
?.
status
?.
availability
||
''
;
},
},
safeHtmlConfig
:
{
ADD_TAGS
:
[
'
gl-emoji
'
]
},
};
</
script
>
...
...
@@ -94,7 +98,7 @@ export default {
<span
class=
"gl-ml-2"
>
{{
user
.
location
}}
</span>
</div>
<div
v-if=
"statusHtml"
class=
"js-user-status gl-mt-3"
>
<span
v-
html=
"statusHtml /* eslint-disable-line vue/no-v-html */
"
></span>
<span
v-
safe-html:
[$
options.safeHtmlConfig]=
"statusHtml
"
></span>
</div>
<div
v-if=
"user.bot"
class=
"gl-text-blue-500"
>
<gl-icon
name=
"question"
/>
...
...
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