Automatic merge of gitlab-org/gitlab-ce master

bbae464c · GitLab Bot · 9f2354a3 · 3ec966ad · bbae464c · bbae464c
Commit bbae464c authored May 10, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

app/assets/javascripts/main.js app/assets/javascripts/main.js +1 -1

changelogs/unreleased/61550-next-badge.yml changelogs/unreleased/61550-next-badge.yml +5 -0

No files found.
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -150,7 +150,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');

--- a/changelogs/unreleased/61550-next-badge.yml
+++ b/changelogs/unreleased/61550-next-badge.yml
+---
+title: Fixes next badge being always visible
+merge_request:
+author:
+type: fixed