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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
421b3a15
Commit
421b3a15
authored
Dec 13, 2018
by
Natalia Tepluhina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent escaping in user tooltip
parent
1ef44964
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
...ripts/vue_shared/components/user_popover/user_popover.vue
+13
-7
No files found.
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View file @
421b3a15
...
...
@@ -30,10 +30,14 @@ export default {
computed
:
{
jobLine
()
{
if
(
this
.
user
.
bio
&&
this
.
user
.
organization
)
{
return
sprintf
(
__
(
'
%{bio} at %{organization}
'
),
{
return
sprintf
(
__
(
'
%{bio} at %{organization}
'
),
{
bio
:
this
.
user
.
bio
,
organization
:
this
.
user
.
organization
,
});
},
false
,
);
}
else
if
(
this
.
user
.
bio
)
{
return
this
.
user
.
bio
;
}
else
if
(
this
.
user
.
organization
)
{
...
...
@@ -66,7 +70,7 @@ export default {
<gl-popover
:target=
"target"
boundary=
"viewport"
placement=
"top"
show
>
<div
class=
"user-popover d-flex"
>
<div
class=
"p-1 flex-shrink-1"
>
<user-avatar-image
:img-src=
"user.avatarUrl"
:size=
"60"
css-classes=
"mr-2"
/>
<user-avatar-image
:img-src=
"user.avatarUrl"
:size=
"60"
css-classes=
"mr-2"
/>
</div>
<div
class=
"p-1 w-100"
>
<h5
class=
"m-0"
>
...
...
@@ -79,7 +83,7 @@ export default {
</h5>
<div
class=
"text-secondary mb-2"
>
<span
v-if=
"user.username"
>
@
{{
user
.
username
}}
</span>
<gl-skeleton-loading
v-else
:lines=
"1"
class=
"animation-container-small mb-1"
/>
<gl-skeleton-loading
v-else
:lines=
"1"
class=
"animation-container-small mb-1"
/>
</div>
<div
class=
"text-secondary"
>
{{
jobLine
}}
...
...
@@ -97,7 +101,9 @@ export default {
class=
"animation-container-small mb-1"
/>
</div>
<div
v-if=
"user.status"
class=
"mt-2"
><span
v-html=
"statusHtml"
></span></div>
<div
v-if=
"user.status"
class=
"mt-2"
>
<span
v-html=
"statusHtml"
></span>
</div>
</div>
</div>
</gl-popover>
...
...
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