diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-07 19:29:19 +0300 |
|---|---|---|
| committer | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-07 19:29:19 +0300 |
| commit | 14687bb95e799ce24aa48b1a88b3a8816d51e6a5 (patch) | |
| tree | e8176358859cc094793186c353f3e291b523d4a1 | |
| parent | 24845799009bf25f367b8f4bb26bd3b094b37112 (diff) | |
Resolve merge conflict
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 563f6038c86..1c1d1ea4645 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -17,9 +17,10 @@ - if logo_text.present? %span.logo-text.d-none.d-lg-block.prepend-left-8 = logo_text - = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do - %span.color-label.has-tooltip.badge.badge-pill.green-badge - = _('Next') + - if Gitlab.com? + = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do + %span.color-label.has-tooltip.badge.badge-pill.green-badge + = _('Next') - if current_user = render "layouts/nav/dashboard" |