Commit a5fb32b5 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'fl-fix-next-flag-for-good' into 'master'

Next badge must be visible when canary flag is true

See merge request gitlab-org/gitlab-ce!28478
parents 22f8368b 5d3747c3
...@@ -148,7 +148,7 @@ function deferredInitialisation() { ...@@ -148,7 +148,7 @@ function deferredInitialisation() {
const canaryBadge = document.querySelector('.js-canary-badge'); const canaryBadge = document.querySelector('.js-canary-badge');
const canaryLink = document.querySelector('.js-canary-link'); const canaryLink = document.querySelector('.js-canary-link');
if (canaryBadge) { if (canaryBadge) {
canaryBadge.classList.add('hidden'); canaryBadge.classList.remove('hidden');
} }
if (canaryLink) { if (canaryLink) {
canaryLink.classList.add('hidden'); canaryLink.classList.add('hidden');
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%span.logo-text.d-none.d-lg-block.prepend-left-8 %span.logo-text.d-none.d-lg-block.prepend-left-8
= logo_text = logo_text
- if Gitlab.com? - if Gitlab.com?
= link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent hidden', target: :_blank do
%span.color-label.has-tooltip.badge.badge-pill.green-badge %span.color-label.has-tooltip.badge.badge-pill.green-badge
= _('Next') = _('Next')
......
---
title: Next badge must visible when canary flag is true
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment