Merge branch '26348-group-members-rearrange' into 'master'

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

app/views/groups/group_members/index.html.haml

 - page_title "Members"
-= render 'groups/head'
 
 .project-members-page.prepend-top-default
   %h4

app/views/groups/subgroups.html.haml

 - @no_container = true
 
+= render 'head'
 = render 'groups/home_panel'
 
 .groups-header{ class: container_class }

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