Add latest changes from gitlab-org/gitlab@master

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?)] }