Commit a0dff2bf authored by Phil Hughes's avatar Phil Hughes

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

Adds information about Canary environment

Closes #46048

See merge request gitlab-org/gitlab-ce!27499
parents 55767af4 d275336b
......@@ -135,6 +135,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', () => {
......
......@@ -447,8 +447,8 @@
}
}
.title-container,
.navbar-nav {
li {
.badge.badge-pill {
position: inherit;
font-weight: $gl-font-weight-normal;
......@@ -460,7 +460,7 @@
border-radius: 7px;
box-shadow: 0 1px 0 rgba($gl-header-color, 0.2);
&.issues-count {
&.green-badge {
background-color: $green-500;
}
......@@ -472,7 +472,6 @@
background-color: $blue-500;
}
}
}
}
@include media-breakpoint-down(xs) {
......
......@@ -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
......
......@@ -7,3 +7,6 @@
= link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback"
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
= render 'shared/user_dropdown_contributing_link'
- if Gitlab.com?
%li.js-canary-link
= link_to _("Switch to GitLab Next"), "https://next.gitlab.com/"
---
title: Adds badge for Canary environment and help link
merge_request:
author:
type: added
......@@ -5942,6 +5942,9 @@ msgstr ""
msgid "Newly registered users will by default be external"
msgstr ""
msgid "Next"
msgstr ""
msgid "No"
msgstr ""
......@@ -8677,6 +8680,9 @@ msgstr ""
msgid "Switch branch/tag"
msgstr ""
msgid "Switch to GitLab Next"
msgstr ""
msgid "System Hooks"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment