From dc6ab436efb1cd78da5d340653d48dc12cdc49c0 Mon Sep 17 00:00:00 2001
From: Dennis Tang <dennis@dennistang.net>
Date: Thu, 18 Oct 2018 13:27:04 +0000
Subject: [PATCH] Resolve "Re-arrange help-related user menu items into new
 Help menu"

---
 app/assets/stylesheets/framework/header.scss               | 4 +---
 app/views/layouts/header/_current_user_dropdown.html.haml  | 7 +------
 app/views/layouts/header/_default.html.haml                | 6 ++++++
 app/views/layouts/header/_help_dropdown.html.haml          | 6 ++++++
 .../shared/_user_dropdown_contributing_link.html.haml      | 2 --
 ...nge-help-related-user-menu-items-into-new-help-menu.yml | 5 +++++
 6 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 app/views/layouts/header/_help_dropdown.html.haml
 create mode 100644 changelogs/unreleased/50728-re-arrange-help-related-user-menu-items-into-new-help-menu.yml

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c430009bfe0..2bee2961847 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -530,8 +530,6 @@
 
 .header-user {
   &.show .dropdown-menu {
-    width: auto;
-    min-width: unset;
     max-height: 323px;
     margin-top: 4px;
     color: $gl-text-color;
@@ -548,7 +546,7 @@
         margin-right: 0;
         display: block;
         vertical-align: text-top;
-        max-width: 148px;
+        max-width: 240px;
         font-size: 12px;
 
         gl-emoji {
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index 261d758622b..648124d3870 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -19,12 +19,7 @@
   - if current_user_menu?(:settings)
     %li
       = link_to s_("CurrentUser|Settings"), profile_path
-  - if current_user_menu?(:help)
-    %li
-      = link_to _("Help"), help_path
-  - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
-    %li.divider
-  = render 'shared/user_dropdown_contributing_link'
   - if current_user_menu?(:sign_out)
+    %li.divider
     %li
       = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link"
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 39604611440..596fc3985b3 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -53,6 +53,12 @@
                 = sprite_icon('todo-done', size: 16)
                 %span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
                   = todos_count_format(todos_pending_count)
+          %li.nav-item.header-help.dropdown
+            = link_to help_path, class: 'header-help-dropdown-toggle', data: { toggle: "dropdown" } do
+              = sprite_icon('question', size: 16)
+              = sprite_icon('angle-down', css_class: 'caret-down')
+            .dropdown-menu.dropdown-menu-right
+              = render 'layouts/header/help_dropdown'
           - if header_link?(:user_dropdown)
             %li.nav-item.header-user.dropdown
               = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml
new file mode 100644
index 00000000000..953c0e7f46c
--- /dev/null
+++ b/app/views/layouts/header/_help_dropdown.html.haml
@@ -0,0 +1,6 @@
+%ul
+  - if current_user_menu?(:help)
+    %li
+      = link_to _("Help"), help_path
+  - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
+    = render 'shared/user_dropdown_contributing_link'
diff --git a/app/views/shared/_user_dropdown_contributing_link.html.haml b/app/views/shared/_user_dropdown_contributing_link.html.haml
index 333d6fa3489..564d21a39be 100644
--- a/app/views/shared/_user_dropdown_contributing_link.html.haml
+++ b/app/views/shared/_user_dropdown_contributing_link.html.haml
@@ -1,5 +1,3 @@
 %li
   = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do
     = _("Contribute to GitLab")
-    = sprite_icon('external-link', size: 16)
-%li.divider
diff --git a/changelogs/unreleased/50728-re-arrange-help-related-user-menu-items-into-new-help-menu.yml b/changelogs/unreleased/50728-re-arrange-help-related-user-menu-items-into-new-help-menu.yml
new file mode 100644
index 00000000000..dfda65ef91b
--- /dev/null
+++ b/changelogs/unreleased/50728-re-arrange-help-related-user-menu-items-into-new-help-menu.yml
@@ -0,0 +1,5 @@
+---
+title: Re-arrange help-related user menu items into new Help menu
+merge_request: 22195
+author:
+type: added