Merge branch 'group-gear-setting-dropdown-to-tab-ee' into 'master'

Moved the gear settings dropdown in the group view to a tab

See merge request !1409

app/views/groups/_settings_head.html.haml

+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
+    = render 'shared/nav_scroll'
+    .nav-links.sub-nav.scrolling-tabs
+      %ul{ class: container_class }
+        = nav_link(path: 'groups#edit') do
+          = link_to edit_group_path(@group), title: 'General' do
+            %span
+              General
+
+        = nav_link(path: 'groups#projects') do
+          = link_to projects_group_path(@group), title: 'Projects' do
+            %span
+              Projects
+
+        - if ldap_enabled?
+          = nav_link(path: 'ldap_group_links#index') do
+            = link_to group_ldap_group_links_path(@group), title: 'LDAP Group' do
+              %span
+                LDAP Group
+
+        = nav_link(path: 'hooks#index') do
+          = link_to group_hooks_path(@group), title: 'Webhooks' do
+            %span
+              Webhooks
+
+        = nav_link(path: 'audit_events#index') do
+          = link_to group_audit_events_path(@group), title: 'Audit Events' do
+            %span
+              Audit Events
+
+        - if @group.shared_runners_enabled? && @group.shared_runners_minutes_limit_enabled?
+          = nav_link(path: 'pipeline_quota#index') do
+            = link_to group_audit_events_path(@group), title: 'Pipelines quota' do
+              %span
+                Pipelines quota

app/views/groups/analytics/show.html.haml

 - page_title "Contribution Analytics"
 - header_title group_title(@group, "Contribution Analytics", group_analytics_path(@group))
+= render "groups/settings_head"
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('common_d3')
   = page_specific_javascript_bundle_tag('graphs')

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

 - page_title "Audit Events"
+= render "groups/settings_head"
+
 %h3.page-title Group Audit Events
 %p.light Events in #{@group.name}
 

app/views/groups/edit.html.haml

+= render "groups/settings_head"
 .panel.panel-default.prepend-top-default
   .panel-heading
     Group settings

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

+= render "groups/settings_head"
 = render 'shared/web_hooks/form', hook: @hook, hooks: @hooks, url_components: [@group]

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

 - page_title "Pipelines quota"
+= render "groups/settings_head"
+
 %h3.page-title
   Group pipelines quota
   = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'

app/views/groups/projects.html.haml

 - page_title "Projects"
+= render "groups/settings_head"
 
 .panel.panel-default.prepend-top-default
   .panel-heading

app/views/layouts/nav/_group.html.haml

-= render 'layouts/nav/group_settings'
 .scrolling-tabs-container{ class: nav_control_class }
   .fade-left
     = icon('angle-left')
@@ -25,8 +24,12 @@
       = link_to group_group_members_path(@group), title: 'Members' do
         %span
           Members
-
     = nav_link(controller: [:stats]) do
       = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
         %span
           Contribution Analytics
+    - if current_user && can?(current_user, :admin_group, @group)
+      = nav_link(path: %w[groups#projects groups#edit ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
+        = link_to edit_group_path(@group), title: 'Settings' do
+          %span
+            Settings

app/views/layouts/nav/_group_settings.html.haml

-- if current_user
-  - can_admin_group = can?(current_user, :admin_group, @group)
-  - can_edit = can?(current_user, :admin_group, @group)
-
-  - if can_admin_group || can_edit
-    .controls
-      .dropdown.group-settings-dropdown
-        %a.dropdown-new.btn.btn-default#group-settings-button{ href: '#', 'data-toggle' => 'dropdown' }
-          = icon('cog')
-          = icon('caret-down')
-        %ul.dropdown-menu.dropdown-menu-align-right
-          - if can_admin_group
-            = nav_link(path: 'groups#projects') do
-              = link_to 'Projects', projects_group_path(@group), title: 'Projects'
-          - if can_edit && can_admin_group
-            %li.divider
-          - if can_edit
-            - if ldap_enabled?
-              = nav_link(controller: :ldap_group_links) do
-                = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
-                  %span
-                    LDAP Groups
-            = nav_link(controller: :hooks) do
-              = link_to group_hooks_path(@group), title: "Webhooks" do
-                %span
-                  Webhooks
-            = nav_link(controller: :audit_events) do
-              = link_to group_audit_events_path(@group), title: "Audit Events" do
-                %span
-                  Audit Events
-            - if @group.shared_runners_enabled? && @group.shared_runners_minutes_limit_enabled?
-              = nav_link(controller: :pipeline_quota) do
-                = link_to group_pipeline_quota_path(@group), title: "Pipelines quota" do
-                  %span
-                    Pipelines quota
-            %li
-              = link_to 'Edit Group', edit_group_path(@group)

changelogs/unreleased/group-gear-setting-dropdown-to-tab.yml

+---
+title: Moved the gear settings dropdown to a tab in the groups view
+merge_request:
+author:

features/steps/groups_management.rb

@@ -46,7 +46,12 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
   step 'I go to group settings page' do
     visit dashboard_groups_path
     click_link 'Sourcing'
-    click_link 'Edit Group'
+    page.within '.layout-nav' do
+      click_link 'Settings'
+    end
+    page.within '.sub-nav' do
+      click_link 'General'
+    end    
   end
 
   step 'I enable membership lock' do
@@ -56,7 +61,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
 
   step 'I go to project settings' do
     @project = Project.find_by(name: "Open")
-    page.within '.layout-nav' do
+    page.within '.sub-nav' do
       click_link 'Projects'
     end