Merge branch 'fl-fix-next-flag-for-good-rc5' into '11-11-stable-prepare-rc5'

Port for RC5 of Next badge must be visible when canary flag is true

See merge request gitlab-org/gitlab-ce!28540

app/assets/javascripts/main.js

@@ -147,7 +147,7 @@ function deferredInitialisation() {
     const canaryBadge = document.querySelector('.js-canary-badge');
     const canaryLink = document.querySelector('.js-canary-link');
     if (canaryBadge) {
-      canaryBadge.classList.add('hidden');
+      canaryBadge.classList.remove('hidden');
     }
     if (canaryLink) {
       canaryLink.classList.add('hidden');

app/views/layouts/header/_default.html.haml

@@ -18,8 +18,9 @@
               %span.logo-text.d-none.d-lg-block.prepend-left-8
                 = logo_text
           - if Gitlab.com?
-            %span.js-canary-badge.badge.badge-pill.green-badge.align-self-center
-              = _('Next')
+            = 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
+                = _('Next')
 
         - if current_user
           = render "layouts/nav/dashboard"

changelogs/unreleased/fl-fix-next-flag-for-good.yml

+---
+title: Next badge must visible when canary flag is true
+merge_request:
+author:
+type: fixed