Merge branch '63227-fix-double-border' into 'master'

Fix Double Border in Profile Page

Closes #63227

See merge request gitlab-org/gitlab-ce!29784

app/assets/stylesheets/framework/blocks.scss

@@ -199,7 +199,6 @@
 
   &.user-cover-block {
     padding: 24px 0 0;
-    border-bottom: 1px solid $border-color;
 
     .nav-links {
       width: 100%;

app/views/users/show.html.haml

@@ -9,7 +9,7 @@
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
 
 .user-profile
-  .cover-block.user-cover-block
+  .cover-block.user-cover-block{ class: [('border-bottom' if profile_tabs.empty?)] }
     .cover-controls
       - if @user == current_user
         = link_to profile_path, class: 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do

changelogs/unreleased/63227-fix-double-border.yml

@@ -0,0 +1,5 @@
+---
+title: Fix Double Border in Profile Page
+merge_request: 29784
+author: Yoginth <@yo>
+type: fixed