diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 21:26:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 21:26:46 +0300 |
commit | 5509e479900ee537980a126287c20327c41a61d6 (patch) | |
tree | 8272f06bd58b1518eca38975f95656ffc5497bd2 /app/views/users | |
parent | e0529f76a36026dc4bd51fbec1e5c52e7f3866e1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/show.html.haml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index f49bb525776..1ebf02ffd39 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -122,9 +122,12 @@ - if display_public_email?(@user) = render 'middle_dot_divider', stacking: true do = link_to @user.public_email, "mailto:#{@user.public_email}", itemprop: 'email' - - if @user.bio.present? && @user.confirmed? && !@user.blocked? - %p.profile-user-bio.gl-mb-3 - = @user.bio + + -# Ensure this stays indented one level less than the social links + -# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118314 + - if @user.bio.present? && @user.confirmed? && !@user.blocked? + %p.profile-user-bio.gl-mb-3 + = @user.bio - if !profile_tabs.empty? && !Feature.enabled?(:profile_tabs_vue, current_user) .scrolling-tabs-container{ class: [('gl-display-none' if show_super_sidebar?)] } |