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
50c11526
Commit
50c11526
authored
Jul 22, 2020
by
Adam Hegyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bio rendering on profile page
parent
0baf75ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
...ripts/vue_shared/components/user_popover/user_popover.vue
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
changelogs/unreleased/fix-bio-rendering-on-profile.yml
changelogs/unreleased/fix-bio-rendering-on-profile.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View file @
50c11526
...
@@ -75,7 +75,7 @@ export default {
...
@@ -75,7 +75,7 @@ export default {
<div
class=
"gl-text-gray-700"
>
<div
class=
"gl-text-gray-700"
>
<div
v-if=
"user.bio"
class=
"gl-display-flex gl-mb-2"
>
<div
v-if=
"user.bio"
class=
"gl-display-flex gl-mb-2"
>
<icon
name=
"profile"
class=
"gl-text-gray-600 gl-flex-shrink-0"
/>
<icon
name=
"profile"
class=
"gl-text-gray-600 gl-flex-shrink-0"
/>
<span
ref=
"bio"
class=
"
ml-1
"
v-html=
"user.bioHtml"
></span>
<span
ref=
"bio"
class=
"
gl-ml-2
"
v-html=
"user.bioHtml"
></span>
</div>
</div>
<div
v-if=
"user.workInformation"
class=
"gl-display-flex gl-mb-2"
>
<div
v-if=
"user.workInformation"
class=
"gl-display-flex gl-mb-2"
>
<icon
name=
"work"
class=
"gl-text-gray-600 gl-flex-shrink-0"
/>
<icon
name=
"work"
class=
"gl-text-gray-600 gl-flex-shrink-0"
/>
...
...
app/views/users/show.html.haml
View file @
50c11526
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
=
link_to
@user
.
public_email
,
"mailto:
#{
@user
.
public_email
}
"
,
class:
'text-link'
=
link_to
@user
.
public_email
,
"mailto:
#{
@user
.
public_email
}
"
,
class:
'text-link'
-
if
@user
.
bio
.
present?
-
if
@user
.
bio
.
present?
.cover-desc.cgray
.cover-desc.cgray
%p
.profile-user-bio
.profile-user-bio
=
markdown
(
@user
.
bio_html
)
=
markdown
(
@user
.
bio_html
)
...
...
changelogs/unreleased/fix-bio-rendering-on-profile.yml
0 → 100644
View file @
50c11526
---
title
:
Fix bio container width on profile page
merge_request
:
37572
author
:
type
:
fixed
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