Changed "Edit Group" subtab to "General" and moved it

to the first option inside said subtab.

Also code cleanup

app/views/groups/_settings_head.html.haml

-- can_admin_group = can?(current_user, :admin_group, @group)
-- can_edit = can?(current_user, :admin_group, @group)
 = 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
@@ -31,9 +34,3 @@
             = link_to group_audit_events_path(@group), title: 'Pipelines quota' do
               %span
                 Pipelines quota
-
-        - if can_edit && can_admin_group
-          = nav_link(path: 'groups#edit') do
-            = link_to edit_group_path(@group), title: 'Edit Group' do
-              %span
-                Edit Group

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

-- can_admin_group = can?(current_user, :admin_group, @group)
 .scrolling-tabs-container{ class: nav_control_class }
   .fade-left
     = icon('angle-left')
@@ -29,8 +28,8 @@
       = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
         %span
           Contribution Analytics
-    - if current_user && can_admin_group
+    - 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 projects_group_path(@group), title: 'Settings' do
+        = link_to edit_group_path(@group), title: 'Settings' do
           %span
             Settings

features/steps/groups_management.rb

@@ -50,7 +50,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
       click_link 'Settings'
     end
     page.within '.sub-nav' do
-      click_link 'Edit Group'
+      click_link 'General'
     end    
   end