Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-12 23:42:21 +0300
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-12 23:42:21 +0300
commita52d8c101d86bb308cbb4a727dff0ecb37ff382f (patch)
tree5c07a7d60ab2d204937a5a7529a310d1ece38599 /app/views
parent9978602d522df1e959bec153b56d818829875fdc (diff)
parent3c6d95a6d3583f57bece4586f077e4d5f5b3ec4f (diff)
Merge branch 'fix_gitlab-ce#41891' into 'master'
fix gitlab-org/gitlab-ce#41891 (design nitpick) Closes #41891 See merge request gitlab-org/gitlab-ce!16383
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/header/_default.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 46727811be4..e7fc83a8d04 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -6,8 +6,10 @@
%h1.title
= link_to root_path, title: 'Dashboard', id: 'logo' do
= brand_header_logo
- %span.logo-text.hidden-xs
- = brand_header_logo_type
+ - logo_text = brand_header_logo_type
+ - if logo_text.present?
+ %span.logo-text.hidden-xs
+ = logo_text
- if current_user
= render "layouts/nav/dashboard"