Merge branch '1194-click-on-projects-in-group-as-non-owner-leads-to-404' into 'master'

Closes #1194

See merge request !837

CHANGELOG-EE.md

@@ -4,6 +4,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 - gitlab:check rake task checks ES version according to requirements
 - Convert ASCII-8BIT LDAP DNs to UTF-8 to avoid unnecessary user deletions
+- [Fix] Only owner can see "Projects" button in group edit menu
 
 ## 8.13.2 (2016-10-31)
 

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

@@ -11,27 +11,29 @@
           = icon('cog')
           = icon('caret-down')
         %ul.dropdown-menu.dropdown-menu-align-right
-          = nav_link(path: 'groups#projects') do
-            = link_to 'Projects', projects_group_path(@group), title: 'Projects'
-          %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
+          - if can_admin_group
+            = nav_link(path: 'groups#projects') do
+              = link_to 'Projects', projects_group_path(@group), title: 'Projects'
+          - if can_edit || can_leave
+            %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
-                    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
-            %li
-              = link_to 'Edit Group', edit_group_path(@group)
-          - if can_leave
-            %li
-              = link_to polymorphic_path([:leave, @group, :members]),
-                data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
-                Leave Group
+                    Webhooks
+              = nav_link(controller: :audit_events) do
+                = link_to group_audit_events_path(@group), title: "Audit Events" do
+                  %span
+                    Audit Events
+              %li
+                = link_to 'Edit Group', edit_group_path(@group)
+            - if can_leave
+              %li
+                = link_to polymorphic_path([:leave, @group, :members]),
+                  data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
+                  Leave Group