Merge branch 'ee-46048-canary-next' into 'master'

EE port of Adds information about Canary env

See merge request gitlab-org/gitlab-ee!11359

app/assets/javascripts/main.js

@@ -138,6 +138,12 @@ function deferredInitialisation() {
   });
 
   loadAwardsHandler();
+
+  // Toggle Canary Badge
+  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');
+  }
 }
 
 document.addEventListener('DOMContentLoaded', () => {

app/assets/stylesheets/framework/header.scss

@@ -447,30 +447,29 @@
   }
 }
 
+.title-container,
 .navbar-nav {
-  li {
-    .badge.badge-pill {
-      position: inherit;
-      font-weight: $gl-font-weight-normal;
-      margin-left: -6px;
-      font-size: 11px;
-      color: $white-light;
-      padding: 0 5px;
-      line-height: 12px;
-      border-radius: 7px;
-      box-shadow: 0 1px 0 rgba($gl-header-color, 0.2);
-
-      &.issues-count {
-        background-color: $green-500;
-      }
+  .badge.badge-pill {
+    position: inherit;
+    font-weight: $gl-font-weight-normal;
+    margin-left: -6px;
+    font-size: 11px;
+    color: $white-light;
+    padding: 0 5px;
+    line-height: 12px;
+    border-radius: 7px;
+    box-shadow: 0 1px 0 rgba($gl-header-color, 0.2);
+
+    &.green-badge {
+      background-color: $green-500;
+    }
 
-      &.merge-requests-count {
-        background-color: $orange-600;
-      }
+    &.merge-requests-count {
+      background-color: $orange-600;
+    }
 
-      &.todos-count {
-        background-color: $blue-500;
-      }
+    &.todos-count {
+      background-color: $blue-500;
     }
   }
 }

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

@@ -17,6 +17,8 @@
             - 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 current_user
           = render "layouts/nav/dashboard"
@@ -38,7 +40,7 @@
               = link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _('Issues') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = sprite_icon('issues', size: 16)
                 - issues_count = assigned_issuables_count(:issues)
-                %span.badge.badge-pill.issues-count{ class: ('hidden' if issues_count.zero?) }
+                %span.badge.badge-pill.issues-count.green-badge{ class: ('hidden' if issues_count.zero?) }
                   = number_with_delimiter(issues_count)
           - if header_link?(:merge_requests)
             = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do

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

@@ -9,3 +9,6 @@
     = render 'shared/user_dropdown_contributing_link'
   - if instance_review_permitted?
     = render 'shared/user_dropdown_instance_review'
+  - if Gitlab.com?
+    %li.js-canary-link
+      = link_to _("Switch to GitLab Next"), "https://next.gitlab.com/"

changelogs/unreleased/46048-canary-next.yml

+---
+title: Adds badge for Canary environment and help link
+merge_request:
+author:
+type: added

locale/gitlab.pot

@@ -7825,6 +7825,9 @@ msgstr ""
 msgid "Newly registered users will by default be external"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
 msgid "No"
 msgstr ""
 
@@ -11359,6 +11362,9 @@ msgstr ""
 msgid "Switch branch/tag"
 msgstr ""
 
+msgid "Switch to GitLab Next"
+msgstr ""
+
 msgid "Sync information"
 msgstr ""