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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
68faad16
Commit
68faad16
authored
Feb 27, 2017
by
Douwe Maan
Committed by
Dmitriy Zaporozhets
Feb 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't allow a project to be shared with an ancestor of the group it is in
parent
71fbbc9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
app/models/project_group_link.rb
app/models/project_group_link.rb
+9
-2
spec/models/project_group_link_spec.rb
spec/models/project_group_link_spec.rb
+16
-1
No files found.
app/models/project_group_link.rb
View file @
68faad16
...
...
@@ -33,8 +33,15 @@ class ProjectGroupLink < ActiveRecord::Base
private
def
different_group
if
self
.
group
&&
self
.
project
&&
self
.
project
.
group
==
self
.
group
errors
.
add
(
:base
,
"Project cannot be shared with the project it is in."
)
return
unless
self
.
group
&&
self
.
project
project_group
=
self
.
project
.
group
return
unless
project_group
group_ids
=
project_group
.
ancestors
.
map
(
&
:id
).
push
(
project_group
.
id
)
if
group_ids
.
include?
(
self
.
group
.
id
)
errors
.
add
(
:base
,
"Project cannot be shared with the group it is in or one of its ancestors."
)
end
end
...
...
spec/models/project_group_link_spec.rb
View file @
68faad16
...
...
@@ -7,12 +7,27 @@ describe ProjectGroupLink do
end
describe
"Validation"
do
let!
(
:project_group_link
)
{
create
(
:project_group_link
)
}
let
(
:parent_group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
,
parent:
parent_group
)
}
let
(
:project
)
{
create
(
:project
,
group:
group
)
}
let!
(
:project_group_link
)
{
create
(
:project_group_link
,
project:
project
)
}
it
{
should
validate_presence_of
(
:project_id
)
}
it
{
should
validate_uniqueness_of
(
:group_id
).
scoped_to
(
:project_id
).
with_message
(
/already shared/
)
}
it
{
should
validate_presence_of
(
:group
)
}
it
{
should
validate_presence_of
(
:group_access
)
}
it
"doesn't allow a project to be shared with the group it is in"
do
project_group_link
.
group
=
group
expect
(
project_group_link
).
not_to
be_valid
end
it
"doesn't allow a project to be shared with an ancestor of the group it is in"
do
project_group_link
.
group
=
parent_group
expect
(
project_group_link
).
not_to
be_valid
end
end
describe
"destroying a record"
,
truncate:
true
do
...
...
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