diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-09-05 23:05:25 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-09-06 12:07:21 -0700 |
| commit | 5404dbb49d4064f7ff3b74ea229edb43f01fd699 (patch) | |
| tree | bde022fe39ea0178a940d93d4b7ce2696fde1270 /app/policies | |
| parent | 45601cbadfd0af6a5ac4ac112129d839265ce3dd (diff) | |
| download | gitlab-ce-5404dbb49d4064f7ff3b74ea229edb43f01fd699.tar.gz | |
Fix ability when Share lock is off
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index e1420de57b8..70622ba553c 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -15,6 +15,7 @@ class GroupPolicy < BasePolicy condition(:nested_groups_supported, scope: :global) { Group.supports_nested_groups? } + condition(:share_locked, scope: :subject) { @subject.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) } @@ -57,7 +58,7 @@ class GroupPolicy < BasePolicy rule { ~can?(:view_globally) }.prevent :request_access rule { has_access }.prevent :request_access - rule { owner & (~parent_share_locked | can_change_parent_share_with_group_lock) }.enable :change_share_with_group_lock + rule { owner & (~share_locked | ~parent_share_locked | can_change_parent_share_with_group_lock) }.enable :change_share_with_group_lock def access_level return GroupMember::NO_ACCESS if @user.nil? |