Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 18 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 007eecdd293..465c9a362ba 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -160,24 +160,6 @@ function deferredInitialisation() {
   });
 
   loadAwardsHandler();
-
-  /**
-   * Toggle Canary Badge
-   *
-   * For GitLab.com only, when the user is using canary
-   * we render a Next badge and hide the option to switch
-   * to canay
-   */
-  if (Cookies.get('gitlab_canary') && Cookies.get('gitlab_canary') === 'true') {
-    const canaryBadge = document.querySelector('.js-canary-badge');
-    const canaryLink = document.querySelector('.js-canary-link');
-    if (canaryBadge) {
-      canaryBadge.classList.remove('hidden');
-    }
-    if (canaryLink) {
-      canaryLink.classList.add('hidden');
-    }
-  }
 }
 
 document.addEventListener('DOMContentLoaded', () => {