Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
75aff0f7
Commit
75aff0f7
authored
Mar 13, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move project members index from `/team` to `/project_members`
parent
e97cdb04
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
10 deletions
+9
-10
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+1
-1
app/views/projects/_settings_nav.html.haml
app/views/projects/_settings_nav.html.haml
+1
-1
config/routes.rb
config/routes.rb
+0
-1
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+1
-1
spec/features/security/project/internal_access_spec.rb
spec/features/security/project/internal_access_spec.rb
+2
-2
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+2
-2
spec/features/security/project/public_access_spec.rb
spec/features/security/project/public_access_spec.rb
+2
-2
No files found.
app/views/admin/projects/show.html.haml
View file @
75aff0f7
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
%small
%small
(
#{
@project
.
users
.
count
}
)
(
#{
@project
.
users
.
count
}
)
.pull-right
.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
%i
.fa.fa-pencil-square-o
Manage Access
Manage Access
%ul
.well-list.project_members
%ul
.well-list.project_members
...
...
app/views/projects/_settings_nav.html.haml
View file @
75aff0f7
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
%span
%span
Project
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
=
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
%i
.fa.fa-users
%span
%span
Members
Members
...
...
config/routes.rb
View file @
75aff0f7
...
@@ -425,7 +425,6 @@ Gitlab::Application.routes.draw do
...
@@ -425,7 +425,6 @@ Gitlab::Application.routes.draw do
end
end
end
end
resources
:team
,
controller:
'team_members'
,
only:
[
:index
]
resources
:milestones
,
except:
[
:destroy
],
constraints:
{
id:
/\d+/
}
do
resources
:milestones
,
except:
[
:destroy
],
constraints:
{
id:
/\d+/
}
do
member
do
member
do
put
:sort_issues
put
:sort_issues
...
...
features/steps/shared/paths.rb
View file @
75aff0f7
...
@@ -386,7 +386,7 @@ module SharedPaths
...
@@ -386,7 +386,7 @@ module SharedPaths
end
end
step
'I visit project "Shop" team page'
do
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
end
step
'I visit project wiki page'
do
step
'I visit project wiki page'
do
...
...
spec/features/security/project/internal_access_spec.rb
View file @
75aff0f7
...
@@ -79,8 +79,8 @@ describe "Internal Project Access", feature: true do
...
@@ -79,8 +79,8 @@ describe "Internal Project Access", feature: true do
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /:project_path/
team
"
do
describe
"GET /:project_path/
project_members
"
do
subject
{
namespace_project_
team_index
_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_
project_members
_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_denied_for
reporter
}
it
{
is_expected
.
to
be_denied_for
reporter
}
...
...
spec/features/security/project/private_access_spec.rb
View file @
75aff0f7
...
@@ -79,8 +79,8 @@ describe "Private Project Access", feature: true do
...
@@ -79,8 +79,8 @@ describe "Private Project Access", feature: true do
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /:project_path/
team
"
do
describe
"GET /:project_path/
project_members
"
do
subject
{
namespace_project_
team_index
_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_
project_members
_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_denied_for
reporter
}
it
{
is_expected
.
to
be_denied_for
reporter
}
...
...
spec/features/security/project/public_access_spec.rb
View file @
75aff0f7
...
@@ -84,8 +84,8 @@ describe "Public Project Access", feature: true do
...
@@ -84,8 +84,8 @@ describe "Public Project Access", feature: true do
it
{
is_expected
.
to
be_allowed_for
:visitor
}
it
{
is_expected
.
to
be_allowed_for
:visitor
}
end
end
describe
"GET /:project_path/
team
"
do
describe
"GET /:project_path/
project_members
"
do
subject
{
namespace_project_
team_index
_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_
project_members
_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_allowed_for
master
}
it
{
is_expected
.
to
be_denied_for
reporter
}
it
{
is_expected
.
to
be_denied_for
reporter
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment