From 75aff0f79c73ccc430a8c92b2317d114a5c8b24d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Mar 2015 16:25:54 +0100
Subject: [PATCH] Move project members index from `/team` to `/project_members`
---
app/views/admin/projects/show.html.haml | 2 +-
app/views/projects/_settings_nav.html.haml | 2 +-
config/routes.rb | 1 -
features/steps/shared/paths.rb | 2 +-
spec/features/security/project/internal_access_spec.rb | 4 ++--
spec/features/security/project/private_access_spec.rb | 4 ++--
spec/features/security/project/public_access_spec.rb | 4 ++--
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 70ebc9561d4..077ee569085 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -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
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index 6f19206b17f..281a84a3d3c 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -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
diff --git a/config/routes.rb b/config/routes.rb
index 547d1aa8660..1b7ae09c773 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index bb6c336d7cd..77a90e80d14 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -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
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index 322697bced8..8d1bfd25223 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -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 }
diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index ea146c3f0e4..9021ff33186 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -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 }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 8ee9199ff29..6ec190ed777 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -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 }
--
GitLab