Move project members index from `/team` to `/project_members`
This commit is contained in:
parent
e97cdb042d
commit
75aff0f79c
|
@ -111,7 +111,7 @@
|
|||
%small
|
||||
(#{@project.users.count})
|
||||
.pull-right
|
||||
= link_to namespace_project_team_index_path(@project.namespace, @project), class: "btn btn-xs" do
|
||||
= link_to namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-xs" do
|
||||
%i.fa.fa-pencil-square-o
|
||||
Manage Access
|
||||
%ul.well-list.project_members
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
%i.fa.fa-pencil-square-o
|
||||
%span
|
||||
Project
|
||||
= link_to namespace_project_team_index_path(@project.namespace, @project), title: 'Members', class: "team-tab tab" do
|
||||
= nav_link(controller: [:project_members, :teams]) do
|
||||
= link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: "team-tab tab" do
|
||||
%i.fa.fa-users
|
||||
%span
|
||||
Members
|
||||
|
|
|
@ -425,7 +425,6 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
end
|
||||
|
||||
resources :team, controller: 'team_members', only: [:index]
|
||||
resources :milestones, except: [:destroy], constraints: { id: /\d+/ } do
|
||||
member do
|
||||
put :sort_issues
|
||||
|
|
|
@ -386,7 +386,7 @@ module SharedPaths
|
|||
end
|
||||
|
||||
step 'I visit project "Shop" team page' do
|
||||
visit namespace_project_team_index_path(project.namespace, project)
|
||||
visit namespace_project_project_members_path(project.namespace, project)
|
||||
end
|
||||
|
||||
step 'I visit project wiki page' do
|
||||
|
|
|
@ -79,8 +79,8 @@ describe "Internal Project Access", feature: true do
|
|||
it { is_expected.to be_denied_for :visitor }
|
||||
end
|
||||
|
||||
describe "GET /:project_path/team" do
|
||||
subject { namespace_project_team_index_path(project.namespace, project) }
|
||||
describe "GET /:project_path/project_members" do
|
||||
subject { namespace_project_project_members_path(project.namespace, project) }
|
||||
|
||||
it { is_expected.to be_allowed_for master }
|
||||
it { is_expected.to be_denied_for reporter }
|
||||
|
|
|
@ -79,8 +79,8 @@ describe "Private Project Access", feature: true do
|
|||
it { is_expected.to be_denied_for :visitor }
|
||||
end
|
||||
|
||||
describe "GET /:project_path/team" do
|
||||
subject { namespace_project_team_index_path(project.namespace, project) }
|
||||
describe "GET /:project_path/project_members" do
|
||||
subject { namespace_project_project_members_path(project.namespace, project) }
|
||||
|
||||
it { is_expected.to be_allowed_for master }
|
||||
it { is_expected.to be_denied_for reporter }
|
||||
|
|
|
@ -84,8 +84,8 @@ describe "Public Project Access", feature: true do
|
|||
it { is_expected.to be_allowed_for :visitor }
|
||||
end
|
||||
|
||||
describe "GET /:project_path/team" do
|
||||
subject { namespace_project_team_index_path(project.namespace, project) }
|
||||
describe "GET /:project_path/project_members" do
|
||||
subject { namespace_project_project_members_path(project.namespace, project) }
|
||||
|
||||
it { is_expected.to be_allowed_for master }
|
||||
it { is_expected.to be_denied_for reporter }
|
||||
|
|
Loading…
Reference in New Issue