diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-16 18:32:50 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-16 18:32:50 +0300 |
| commit | 5b57f72de9800df2263bf634bfef6893c3c6538c (patch) | |
| tree | 37d7603c43e926989743461dc4f26c2e25cd6f7b /app/helpers | |
| parent | 5fbda2af920a86e11696cae5b3397c3241f21b77 (diff) | |
| parent | 0332356d9275d58c1a3050b54c2a6d653299c6df (diff) | |
Merge branch 'brand_header_change' into 'master'
When a custom header logo is present, don't show GitLab type logo
See merge request gitlab-org/gitlab-ce!15410
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/appearances_helper.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb index 8ad94d3f723..df590cf47c8 100644 --- a/app/helpers/appearances_helper.rb +++ b/app/helpers/appearances_helper.rb @@ -30,4 +30,11 @@ module AppearancesHelper render 'shared/logo.svg' end end + + # Skip the 'GitLab' type logo when custom brand logo is set + def brand_header_logo_type + unless brand_item && brand_item.header_logo? + render 'shared/logo_type.svg' + end + end end |