From a2c373f9ef7c68b86d6a4e983d7cbb6fc142e7a1 Mon Sep 17 00:00:00 2001
From: Yoginth <me@yoginth.com>
Date: Wed, 19 Jun 2019 17:31:05 +0000
Subject: [PATCH] Fix double border in profile page

---
 app/assets/stylesheets/framework/blocks.scss      | 1 -
 app/views/users/show.html.haml                    | 2 +-
 changelogs/unreleased/63227-fix-double-border.yml | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/63227-fix-double-border.yml

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 65c0ee74c60..53a8f7c483a 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/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%;
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index a71bfd624e4..b3a73030859 100644
--- a/app/views/users/show.html.haml
+++ b/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
diff --git a/changelogs/unreleased/63227-fix-double-border.yml b/changelogs/unreleased/63227-fix-double-border.yml
new file mode 100644
index 00000000000..6cc4040d333
--- /dev/null
+++ b/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