diff options
| author | Fabio Papa <fabtheman@gmail.com> | 2019-06-28 13:31:47 -0700 |
|---|---|---|
| committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-19 12:06:57 -0700 |
| commit | a2cd8e0dab5c5efb3f1c6a6968337b371e194a24 (patch) | |
| tree | 57667cf2eb1c6b60b0015f719b701120d063cc0a /spec/policies | |
| parent | 396926bbe4182d415e8aa129f45bc1c8ba9e4694 (diff) | |
| download | gitlab-ce-a2cd8e0dab5c5efb3f1c6a6968337b371e194a24.tar.gz | |
Style rules; Revert some examples
Diffstat (limited to 'spec/policies')
| -rw-r--r-- | spec/policies/group_policy_spec.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index 893b686da43..dc3675a7b9e 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -506,15 +506,11 @@ describe GroupPolicy do context "create_subgroup" do context 'when group has subgroup creation level set to owner' do -<<<<<<< HEAD let(:group) do create( :group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) end -======= - let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) } ->>>>>>> Add examples specing the setting to choose who can create subgroups context 'reporter' do let(:current_user) { reporter } @@ -542,15 +538,11 @@ describe GroupPolicy do end context 'when group has subgroup creation level set to maintainer' do -<<<<<<< HEAD let(:group) do create( :group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) end -======= - let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) } ->>>>>>> Add examples specing the setting to choose who can create subgroups context 'reporter' do let(:current_user) { reporter } |