summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-05-20 13:29:58 +0100
committerFilipa Lacerda <filipa@gitlab.com>2019-05-21 12:10:28 +0100
commitaa583f102f13e182fe4162cdef36d80d63bc05bc (patch)
tree83614ff687068e550af400238c716078fc3a69d6
parent406fe0e9f2908d1fb1736ff75686434a73576ad6 (diff)
downloadgitlab-ce-aa583f102f13e182fe4162cdef36d80d63bc05bc.tar.gz
Next badge must be visible when canary flag is truefl-fix-next-flag-for-good-rc5
-rw-r--r--app/assets/javascripts/main.js2
-rw-r--r--app/views/layouts/header/_default.html.haml5
-rw-r--r--changelogs/unreleased/fl-fix-next-flag-for-good.yml5
3 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 213d5c6521a..b503c746801 100644
--- a/app/assets/javascripts/main.js
+++ b/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');
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 724c9976954..f8b7d0c530a 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/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"
diff --git a/changelogs/unreleased/fl-fix-next-flag-for-good.yml b/changelogs/unreleased/fl-fix-next-flag-for-good.yml
new file mode 100644
index 00000000000..93f27824213
--- /dev/null
+++ b/changelogs/unreleased/fl-fix-next-flag-for-good.yml
@@ -0,0 +1,5 @@
+---
+title: Next badge must visible when canary flag is true
+merge_request:
+author:
+type: fixed