diff options
author | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:38:02 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:38:02 -0800 |
commit | b9fcefc895fe140018b97912891121f76afe6648 (patch) | |
tree | 947f46a77f072d934f856293dd6e651572799ace | |
parent | 997290fcba1058650390645d099a7245510470b6 (diff) | |
download | gitlab-ce-b9fcefc895fe140018b97912891121f76afe6648.tar.gz |
Resolve conflicts in spec/policies/group_policy_spec.rb
-rw-r--r-- | spec/policies/group_policy_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index 5cb0183df3a..4c31ff30fc6 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -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 |