Commit b9fcefc8 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in spec/policies/group_policy_spec.rb

parent 997290fc
Pipeline #50309959 failed with stages
in 46 minutes and 59 seconds
......@@ -114,25 +114,13 @@ describe GroupPolicy do
project.add_developer(current_user)
end
<<<<<<< HEAD
it do
expect_allowed(:read_group, :read_list, :read_label)
end
=======
it { expect_allowed(:read_label) }
>>>>>>> dev/master
context 'in subgroups', :nested_groups do
let(:subgroup) { create(:group, :private, parent: group) }
let(:project) { create(:project, namespace: subgroup) }
<<<<<<< HEAD
it do
expect_allowed(:read_group, :read_list, :read_label)
end
=======
it { expect_allowed(:read_label) }
>>>>>>> dev/master
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment