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

Fixed project members link not staying active

Closes gitlab-ee#2942

See merge request !12882

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