BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 09617b7d by Annabel Dunstone Gray
Options

Merge branch 'project-sidebar-members' into 'master'

Fixed project members link not staying active Closes gitlab-ee#2942 See merge request !12882
parents 05329d4a 5a281ea9
Showing with 3 additions and 3 deletions
app/views/layouts/nav/_new_project_sidebar.html.haml
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
Snippets Snippets
- if project_nav_tab? :settings - 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 = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do
%span %span
Settings Settings
...@@ -177,8 +177,8 @@ ...@@ -177,8 +177,8 @@
= link_to edit_project_path(@project), title: 'General' do = link_to edit_project_path(@project), title: 'General' do
%span %span
General General
= nav_link(controller: :members) do = nav_link(controller: :project_members) do
= link_to project_settings_members_path(@project), title: 'Members' do = link_to project_project_members_path(@project), title: 'Members' do
%span %span
Members Members
- if can_edit - if can_edit
......
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