Merge branch 'nav-settings' into 'master'

Clarify navigation labels for Project Settings and Group Settings.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337.

See merge request !703

CHANGELOG

@@ -21,6 +21,7 @@ v 7.12.0 (unreleased)
   - Add Accepted and Rejected tabs to MR lists.
   - Prefix EmailsOnPush email subject with `[Git]`.
   - Group project contributions by both name and email. 
+  - Clarify navigation labels for Project Settings and Group Settings.
 
 v 7.11.2
   - no changes

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

@@ -44,7 +44,7 @@
         = link_to edit_group_path(@group), title: 'Group', data: {placement: 'right'} do
           = icon('pencil-square-o')
           %span
-            Group
+            Group Settings
       = nav_link(path: 'groups#projects') do
         = link_to projects_group_path(@group), title: 'Projects', data: {placement: 'right'} do
           = icon('folder')

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

@@ -12,7 +12,7 @@
       = link_to edit_project_path(@project), title: 'Project', class: 'stat-tab tab', data: {placement: 'right'} do
         = icon('pencil-square-o')
         %span
-          Project
+          Project Settings
     = nav_link(controller: [:project_members, :teams]) do
       = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab', data: {placement: 'right'} do
         = icon('users')