diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-26 11:53:26 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-26 11:53:26 +0300 |
| commit | a0dff2bfe5227f01bbda02d40abd062d8cc25bb0 (patch) | |
| tree | 2295da115db39d1dc94c5923ee897b8ea0f444cb /app/views | |
| parent | 55767af463441744140d3fbfd44b00026ed83350 (diff) | |
| parent | d275336b0b68f8b3c4e65cf754d5062d18ad9da4 (diff) | |
Merge branch '46048-canary-next' into 'master'
Adds information about Canary environment
Closes #46048
See merge request gitlab-org/gitlab-ce!27499
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/header/_help_dropdown.html.haml | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index a9b85889846..319d0307f78 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/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 diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index cd9128c452b..c53bfd8a85d 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -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/" |