kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve conflicts in group policy

This commit is contained in:
Małgorzata Ksionek 2019-03-05 10:38:09 +01:00
parent ad2f711adf
commit a24eabb178
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/policies/group_policy.rb
View File

@ -53,7 +53,6 @@ class GroupPolicy < BasePolicy
rule { admin }.enable :read_group
rule { has_projects }.policy do
enable :read_group
enable :read_list
enable :read_label
end

4
spec/policies/group_policy_spec.rb
View File

@ -114,13 +114,13 @@ describe GroupPolicy do
project.add_developer(current_user)
end
it { expect_allowed(:read_label) }
it { expect_allowed(:read_label, :read_list) }
context 'in subgroups', :nested_groups do
let(:subgroup) { create(:group, :private, parent: group) }
let(:project) { create(:project, namespace: subgroup) }
it { expect_allowed(:read_label) }
it { expect_allowed(:read_label, :read_list) }
end
end