Fix group navigation after merge from CE

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

@@ -35,9 +35,8 @@
       = icon('users fw')
       %span
         Members
-  - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
-      = link_to edit_group_path(@group), title: 'Settings' do
-        = icon ('cogs fw')
-        %span
-          Settings
+  = nav_link(controller: [:stats]) do
+    = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
+      = icon('bar-chart fw')
+      %span
+        Contribution Analytics

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

@@ -10,10 +10,6 @@
             = nav_link(path: 'groups#projects') do
               = link_to projects_group_path(@group), title: 'Projects' do
                 Projects
-            %li.divider
-            %li
-              = link_to edit_group_path(@group) do
-                Edit Group
             - if ldap_enabled?
               = nav_link(controller: :ldap_group_links) do
                 = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
@@ -30,6 +26,10 @@
                 %i.fa.fa-file-text-o
                 %span
                   Audit Events
+            %li.divider
+            %li
+              = link_to edit_group_path(@group) do
+                Edit Group
           %li
             = link_to leave_group_group_members_path(@group),
               data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do

features/steps/groups_management.rb

@@ -53,7 +53,9 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
 
   step 'I go to project settings' do
     @project = Project.find_by(name: "Open")
-    click_link 'Projects'
+    page.within '.layout-nav' do
+      click_link 'Projects'
+    end
 
     link = "/#{@project.path_with_namespace}/project_members"
     find(:xpath, "//a[@href=\"#{link}\"]").click