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-20 13:30:40 +0100
commit5d3747c39ac7418b0539e0794ddc0450c0452334 (patch)
treed93d44cef83df0683ee02c2b06c510f768aa3b4a
parent801309308e677e724c772fddb1b99b0012453395 (diff)
downloadgitlab-ce-5d3747c39ac7418b0539e0794ddc0450c0452334.tar.gz
Next badge must be visible when canary flag is truefl-fix-next-flag-for-good
-rw-r--r--app/assets/javascripts/main.js2
-rw-r--r--app/views/layouts/header/_default.html.haml2
-rw-r--r--changelogs/unreleased/fl-fix-next-flag-for-good.yml5
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 1af21715551..9f30a989295 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -148,7 +148,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 1c1d1ea4645..f8b7d0c530a 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -18,7 +18,7 @@
%span.logo-text.d-none.d-lg-block.prepend-left-8
= logo_text
- 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
= _('Next')
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