Commit fcc0ff2c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 2cd1cee6 0c8d8b91
...@@ -21,6 +21,7 @@ v 7.12.0 (unreleased) ...@@ -21,6 +21,7 @@ v 7.12.0 (unreleased)
- Add Accepted and Rejected tabs to MR lists. - Add Accepted and Rejected tabs to MR lists.
- Prefix EmailsOnPush email subject with `[Git]`. - Prefix EmailsOnPush email subject with `[Git]`.
- Group project contributions by both name and email. - Group project contributions by both name and email.
- Clarify navigation labels for Project Settings and Group Settings.
v 7.11.2 v 7.11.2
- no changes - no changes
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
= link_to edit_group_path(@group), title: 'Group', data: {placement: 'right'} do = link_to edit_group_path(@group), title: 'Group', data: {placement: 'right'} do
= icon('pencil-square-o') = icon('pencil-square-o')
%span %span
Group Group Settings
= nav_link(path: 'groups#projects') do = nav_link(path: 'groups#projects') do
= link_to projects_group_path(@group), title: 'Projects', data: {placement: 'right'} do = link_to projects_group_path(@group), title: 'Projects', data: {placement: 'right'} do
= icon('folder') = icon('folder')
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= link_to edit_project_path(@project), title: 'Project', class: 'stat-tab tab', data: {placement: 'right'} do = link_to edit_project_path(@project), title: 'Project', class: 'stat-tab tab', data: {placement: 'right'} do
= icon('pencil-square-o') = icon('pencil-square-o')
%span %span
Project Project Settings
= nav_link(controller: [:project_members, :teams]) do = 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 = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab', data: {placement: 'right'} do
= icon('users') = icon('users')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment