From dd9662389066e8616c2a151e707c82c563cd819d Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Tue, 28 Feb 2017 22:46:01 +0530
Subject: Move `Group -> Members` to top-level, fix missing sub-nav for
 Subgroups

---
 app/views/groups/_head.html.haml               | 7 +------
 app/views/groups/group_members/index.html.haml | 1 -
 app/views/groups/subgroups.html.haml           | 1 +
 app/views/layouts/nav/_group.html.haml         | 6 +++++-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/views/groups/_head.html.haml b/app/views/groups/_head.html.haml
index 6b296ea8dea..873504099d4 100644
--- a/app/views/groups/_head.html.haml
+++ b/app/views/groups/_head.html.haml
@@ -3,7 +3,7 @@
     = render 'shared/nav_scroll'
     .nav-links.sub-nav.scrolling-tabs
       %ul{ class: container_class }
-        = nav_link(path: 'groups#show', html_options: { class: 'home' }) do
+        = nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do
           = link_to group_path(@group), title: 'Group Home' do
             %span
               Home
@@ -12,8 +12,3 @@
           = link_to activity_group_path(@group), title: 'Activity' do
             %span
               Activity
-
-        = nav_link(path: 'group_members#index') do
-          = link_to group_group_members_path(@group), title: 'Members' do
-            %span
-              Members
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 8cb56443191..2e4e4511bb6 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Members"
-= render 'groups/head'
 
 .project-members-page.prepend-top-default
   %h4
diff --git a/app/views/groups/subgroups.html.haml b/app/views/groups/subgroups.html.haml
index 8610ae7e0ef..be809083139 100644
--- a/app/views/groups/subgroups.html.haml
+++ b/app/views/groups/subgroups.html.haml
@@ -1,5 +1,6 @@
 - @no_container = true
 
+= render 'head'
 = render 'groups/home_panel'
 
 .groups-header{ class: container_class }
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index e0742d70fac..a6e96942021 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -5,7 +5,7 @@
   .fade-right
     = icon('angle-right')
   %ul.nav-links.scrolling-tabs
-    = nav_link(path: ['groups#show', 'groups#activity', 'group_members#index'], html_options: { class: 'home' }) do
+    = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
       = link_to group_path(@group), title: 'Home' do
         %span
           Group
@@ -21,3 +21,7 @@
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
           %span.badge.count= number_with_delimiter(merge_requests.count)
+    = nav_link(path: 'group_members#index') do
+      = link_to group_group_members_path(@group), title: 'Members' do
+        %span
+          Members
-- 
cgit v1.2.1