summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-10 21:07:09 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-05-14 16:31:18 +0000
commitacf15521f7abb5318281e011f9a186893e1e7655 (patch)
tree9620832fc917fdcf4e5ee06d8a6e3b56724d174b
parent25539e7ef1594b6b1e42f0c43411e242a53b89ff (diff)
downloadgitlab-ce-acf15521f7abb5318281e011f9a186893e1e7655.tar.gz
Merge branch '61550-next-badge' into 'master'
Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249 (cherry picked from commit 3ec966ade28393ee8f72e9537205c00ff932be69) f769f539 Fixes next badge being always visible
-rw-r--r--app/assets/javascripts/main.js2
-rw-r--r--changelogs/unreleased/61550-next-badge.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index b503c746801..213d5c6521a 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.remove('hidden');
+ canaryBadge.classList.add('hidden');
}
if (canaryLink) {
canaryLink.classList.add('hidden');
diff --git a/changelogs/unreleased/61550-next-badge.yml b/changelogs/unreleased/61550-next-badge.yml
new file mode 100644
index 00000000000..122e394a68c
--- /dev/null
+++ b/changelogs/unreleased/61550-next-badge.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes next badge being always visible
+merge_request:
+author:
+type: fixed