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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a4b564b6
Commit
a4b564b6
authored
Sep 05, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor based on code review
parent
f25b5b7f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
app/models/namespace.rb
app/models/namespace.rb
+2
-2
app/policies/group_policy.rb
app/policies/group_policy.rb
+1
-1
app/services/concerns/update_visibility_level.rb
app/services/concerns/update_visibility_level.rb
+1
-1
app/services/groups/update_service.rb
app/services/groups/update_service.rb
+1
-1
app/services/projects/update_service.rb
app/services/projects/update_service.rb
+1
-1
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+3
-3
No files found.
app/models/namespace.rb
View file @
a4b564b6
...
...
@@ -46,7 +46,7 @@ class Namespace < ActiveRecord::Base
before_create
:sync_share_with_group_lock_with_parent
before_update
:sync_share_with_group_lock_with_parent
,
if: :parent_changed?
after_
commit
:force_share_with_group_lock_on_descendants
,
on: :update
,
if:
->
{
previous_changes
.
key?
(
'share_with_group_lock'
)
&&
share_with_group_lock?
}
after_
update
:force_share_with_group_lock_on_descendants
,
if:
->
{
share_with_group_lock_changed?
&&
share_with_group_lock?
}
# Legacy Storage specific hooks
...
...
@@ -225,7 +225,7 @@ class Namespace < ActiveRecord::Base
end
def
sync_share_with_group_lock_with_parent
if
has_parent?
&&
parent
.
share_with_group_lock?
if
parent
&
.
share_with_group_lock?
self
.
share_with_group_lock
=
true
end
end
...
...
app/policies/group_policy.rb
View file @
a4b564b6
...
...
@@ -15,7 +15,7 @@ class GroupPolicy < BasePolicy
condition
(
:nested_groups_supported
,
scope: :global
)
{
Group
.
supports_nested_groups?
}
condition
(
:parent_share_locked
)
{
@subject
.
has_parent?
&&
@subject
.
parent
.
share_with_group_lock?
}
condition
(
:parent_share_locked
,
scope: :subject
)
{
@subject
.
parent
&
.
share_with_group_lock?
}
condition
(
:can_change_parent_share_with_group_lock
)
{
@subject
.
has_parent?
&&
can?
(
:change_share_with_group_lock
,
@subject
.
parent
)
}
condition
(
:has_projects
)
do
...
...
app/services/concerns/update_visibility_level.rb
View file @
a4b564b6
module
UpdateVisibilityLevel
def
v
isibility_level_allowed
?
(
target
,
new_visibility
)
def
v
alid_visibility_level_change
?
(
target
,
new_visibility
)
# check that user is allowed to set specified visibility_level
if
new_visibility
&&
new_visibility
.
to_i
!=
target
.
visibility_level
unless
can?
(
current_user
,
:change_visibility_level
,
target
)
&&
...
...
app/services/groups/update_service.rb
View file @
a4b564b6
...
...
@@ -5,7 +5,7 @@ module Groups
def
execute
reject_parent_id!
return
false
unless
v
isibility_level_allowed
?
(
group
,
params
[
:visibility_level
])
return
false
unless
v
alid_visibility_level_change
?
(
group
,
params
[
:visibility_level
])
return
false
unless
valid_share_with_group_lock_change?
...
...
app/services/projects/update_service.rb
View file @
a4b564b6
...
...
@@ -3,7 +3,7 @@ module Projects
include
UpdateVisibilityLevel
def
execute
unless
v
isibility_level_allowed
?
(
project
,
params
[
:visibility_level
])
unless
v
alid_visibility_level_change
?
(
project
,
params
[
:visibility_level
])
return
error
(
'New visibility level not allowed!'
)
end
...
...
spec/models/namespace_spec.rb
View file @
a4b564b6
...
...
@@ -433,7 +433,7 @@ describe Namespace do
let!
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)}
it
'the subgroup share lock becomes enabled'
do
root_group
.
update
(
share_with_group_lock:
true
)
root_group
.
update
!
(
share_with_group_lock:
true
)
expect
(
subgroup
.
reload
.
share_with_group_lock
).
to
be_truthy
end
...
...
@@ -446,7 +446,7 @@ describe Namespace do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
,
share_with_group_lock:
true
)}
it
'the subgroup share lock does not change'
do
root_group
.
update
(
share_with_group_lock:
false
)
root_group
.
update
!
(
share_with_group_lock:
false
)
expect
(
subgroup
.
reload
.
share_with_group_lock
).
to
be_truthy
end
...
...
@@ -456,7 +456,7 @@ describe Namespace do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)}
it
'the subgroup share lock does not change'
do
root_group
.
update
(
share_with_group_lock:
false
)
root_group
.
update
!
(
share_with_group_lock:
false
)
expect
(
subgroup
.
reload
.
share_with_group_lock?
).
to
be_falsey
end
...
...
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