diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 11:48:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 11:48:33 +0000 |
| commit | fcc0ff2ccd71860d9eb802471806830a0eb77243 (patch) | |
| tree | 26caa872b0761f01a94b86221ba2b71c8fa7bdf6 | |
| parent | 2cd1cee639843fed70bdd1be27c147bb6a719877 (diff) | |
| parent | 0c8d8b91e0a9f39c67c0f10c73cd9a0a08913a54 (diff) | |
| download | gitlab-ce-fcc0ff2ccd71860d9eb802471806830a0eb77243.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project_settings.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8f77dd6561c..a62296e0656 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index 62f0579d48b..9f1654b25b4 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/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') diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index 21260302a09..7dd14449def 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/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') |