Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

4 files changed, 35 insertions, 8 deletions

diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 70ab0a56581..f7e93182ca2 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -16,7 +16,7 @@
                 = logo_text
           - if Gitlab.com_and_canary?
             = link_to 'https://next.gitlab.com', class: 'canary-badge bg-transparent', target: :_blank do
-              %span.color-label.has-tooltip.badge.badge-pill.green-badge
+              %span.gl-badge.gl-bg-green-500.gl-text-white.gl-rounded-pill.gl-font-weight-bold.gl-py-1
                 = _('Next')
 
         - if current_user
@@ -47,17 +47,36 @@
                 %span.badge.badge-pill.issues-count.green-badge{ class: ('hidden' if issues_count == 0) }
                   = number_with_delimiter(issues_count)
           - if header_link?(:merge_requests)
-            = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do
-              = link_to assigned_mrs_dashboard_path, title: _('Merge requests'), class: 'dashboard-shortcuts-merge_requests', aria: { label: _('Merge requests') },
-                data: { qa_selector: 'merge_requests_shortcut_button', toggle: 'tooltip', placement: 'bottom',
+            - reviewers_enabled = merge_request_reviewers_enabled?
+            = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter #{reviewers_enabled ? 'dropdown' : ''}" }) do
+              = link_to assigned_mrs_dashboard_path, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') },
+                data: { qa_selector: 'merge_requests_shortcut_button',
+                toggle: reviewers_enabled ? "dropdown" : "tooltip",
+                placement: 'bottom',
                 track_label: 'main_navigation',
                 track_event: 'click_merge_link',
                 track_property: 'navigation',
                 container: 'body' } do
                 = sprite_icon('git-merge')
-                - merge_requests_count = assigned_issuables_count(:merge_requests)
-                %span.badge.badge-pill.merge-requests-count{ class: ('hidden' if merge_requests_count == 0) }
-                  = number_with_delimiter(merge_requests_count)
+                %span.badge.badge-pill.merge-requests-count.js-merge-requests-count{ class: ('hidden' if user_merge_requests_counts[:total] == 0) }
+                  = number_with_delimiter(user_merge_requests_counts[:total])
+                - if reviewers_enabled
+                  = sprite_icon('chevron-down', css_class: 'caret-down gl-mx-0!')
+              - if reviewers_enabled
+                .dropdown-menu.dropdown-menu-right
+                  %ul
+                    %li.dropdown-header
+                      = _('Merge requests')
+                    %li
+                      = link_to assigned_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do
+                        = _('Assigned to you')
+                        %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-assigned-mr-count{ class: "" }
+                          = user_merge_requests_counts[:assigned]
+                    %li
+                      = link_to reviewer_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do
+                        = _('Review requests for you')
+                        %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-reviewer-mr-count{ class: "" }
+                          = user_merge_requests_counts[:review_requested]
           - if header_link?(:todos)
             = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do
               = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos',
diff --git a/app/views/layouts/header/_group_invite_members_new_dropdown_item.html.haml b/app/views/layouts/header/_group_invite_members_new_dropdown_item.html.haml
new file mode 100644
index 00000000000..cb74c77dff8
--- /dev/null
+++ b/app/views/layouts/header/_group_invite_members_new_dropdown_item.html.haml
@@ -0,0 +1,3 @@
+- return unless Gitlab::Experimentation.active?(:invite_members_new_dropdown) && can?(current_user, :admin_group_member, @group)
+
+%li= dropdown_invite_members_link(@group)
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index 2c5cd7e96c7..1fc9831d271 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -2,7 +2,7 @@
   = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", id: "js-onboarding-new-project-link", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do
     = sprite_icon('plus-square')
     = sprite_icon('chevron-down', css_class: 'caret-down')
-  .dropdown-menu.dropdown-menu-right
+  .dropdown-menu.dropdown-menu-right.dropdown-extended-height
     %ul
       - if @group&.persisted?
         - create_group_project = can?(current_user, :create_projects, @group)
@@ -16,6 +16,7 @@
           - if create_group_subgroup
             %li= link_to _('New subgroup'), new_group_path(parent_id: @group.id)
           = render_if_exists 'layouts/header/create_epic_new_dropdown_item'
+          = render 'layouts/header/group_invite_members_new_dropdown_item'
           %li.divider
           %li.dropdown-bold-header GitLab
 
@@ -33,6 +34,7 @@
             %li= link_to _('New merge request'), project_new_merge_request_path(merge_project)
           - if create_project_snippet
             %li= link_to _('New snippet'), new_project_snippet_path(@project)
+          = render 'layouts/header/project_invite_members_new_dropdown_item'
           %li.divider
           %li.dropdown-bold-header GitLab
       - if current_user.can_create_project?
diff --git a/app/views/layouts/header/_project_invite_members_new_dropdown_item.html.haml b/app/views/layouts/header/_project_invite_members_new_dropdown_item.html.haml
new file mode 100644
index 00000000000..2cb67e857e3
--- /dev/null
+++ b/app/views/layouts/header/_project_invite_members_new_dropdown_item.html.haml
@@ -0,0 +1,3 @@
+- return unless Gitlab::Experimentation.active?(:invite_members_new_dropdown) && can_import_members?
+
+%li= dropdown_invite_members_link(@project)