Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/main.js

@@ -139,10 +139,22 @@ function deferredInitialisation() {
 
   loadAwardsHandler();
 
-  // Toggle Canary Badge
+  /**
+   * 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') {
-    document.querySelector('.js-canary-badge').classList.remove('hidden');
-    document.querySelector('.js-canary-link').classList.add('hidden');
+    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');
+    }
   }
 }
 

app/assets/stylesheets/pages/todos.scss

@@ -110,45 +110,38 @@
   }
 
   .todo-body {
-    .todo-note {
-      word-wrap: break-word;
-
-      .md {
-        color: $gl-grayish-blue;
-        font-size: $gl-font-size;
-
-        .badge.badge-pill {
-          color: $gl-text-color;
-        }
+    .badge.badge-pill,
+    p {
+      color: $gl-text-color;
+    }
 
-        p {
-          color: $gl-text-color;
-        }
-      }
+    .md {
+      color: $gl-grayish-blue;
+      font-size: $gl-font-size;
+    }
 
-      code {
-        white-space: pre-wrap;
-      }
+    code {
+      white-space: pre-wrap;
+    }
 
-      pre {
-        border: 0;
-        background: $gray-light;
-        border-radius: 0;
-        color: $gl-gray-500;
-        margin: 0 20px;
-        overflow: hidden;
-      }
+    pre {
+      border: 0;
+      background: $gray-light;
+      border-radius: 0;
+      color: $gl-gray-500;
+      margin: 0 20px;
+      overflow: hidden;
+    }
 
-      .note-image-attach {
-        margin-top: 4px;
-        margin-left: 0;
-        max-width: 200px;
-        float: none;
-      }
+    .note-image-attach {
+      margin-top: 4px;
+      margin-left: 0;
+      max-width: 200px;
+      float: none;
+    }
 
-      p:last-child {
-        margin-bottom: 0;
-      }
+    p:last-child {
+      margin-bottom: 0;
     }
   }
 }

app/views/dashboard/todos/_todo.html.haml

@@ -34,7 +34,7 @@
         = todo_due_date(todo)
 
     .todo-body
-      .todo-note
+      .todo-note.break-word
         .md
           = first_line_in_markdown(todo, :body, 150, project: todo.project)
 

app/views/layouts/header/_default.html.haml

@@ -17,8 +17,9 @@
             - if logo_text.present?
               %span.logo-text.d-none.d-lg-block.prepend-left-8
                 = logo_text
-          %span.js-canary-badge.badge.badge-pill.green-badge.align-self-center
-            = _('Next')
+          - if Gitlab.com?
+            %span.js-canary-badge.badge.badge-pill.green-badge.align-self-center
+              = _('Next')
 
         - if current_user
           = render "layouts/nav/dashboard"

changelogs/unreleased/61278-next.yml

+---
+title: Render Next badge only for gitlab.com
+merge_request: 28056
+author:
+type: fixed