diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-17 15:33:34 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-17 15:33:34 +0000 |
| commit | 09617b7d7614d103af7cc32693db905c353a6090 (patch) | |
| tree | 52ab35df2ac40ebebc1c7657a05180b5430b0681 | |
| parent | 05329d4a364a5c55f2de9546871de1909b6be3f5 (diff) | |
| parent | 5a281ea91986695b237cec8f4cedfd9c30d99d4c (diff) | |
| download | gitlab-ce-09617b7d7614d103af7cc32693db905c353a6090.tar.gz | |
Merge branch 'project-sidebar-members' into 'master'
Fixed project members link not staying active
Closes gitlab-ee#2942
See merge request !12882
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 8838852803b..7c9822c5a6a 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -165,7 +165,7 @@ Snippets - if project_nav_tab? :settings - = nav_link(path: %w[projects#edit members#show integrations#show services#edit repository#show ci_cd#show pages#show]) do + = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show pages#show]) do = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do %span Settings @@ -177,8 +177,8 @@ = link_to edit_project_path(@project), title: 'General' do %span General - = nav_link(controller: :members) do - = link_to project_settings_members_path(@project), title: 'Members' do + = nav_link(controller: :project_members) do + = link_to project_project_members_path(@project), title: 'Members' do %span Members - if can_edit |