Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 0 deletions

diff --git a/spec/features/security/group/internal_access_spec.rb b/spec/features/security/group/internal_access_spec.rb
index 904431b4a0f..ad2df4a1882 100644
--- a/spec/features/security/group/internal_access_spec.rb
+++ b/spec/features/security/group/internal_access_spec.rb
@@ -27,9 +27,11 @@ RSpec.describe 'Internal Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -47,9 +49,11 @@ RSpec.describe 'Internal Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -69,9 +73,11 @@ RSpec.describe 'Internal Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -89,9 +95,11 @@ RSpec.describe 'Internal Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -109,9 +117,11 @@ RSpec.describe 'Internal Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_denied_for(:maintainer).of(group) }
     it { is_expected.to be_denied_for(:developer).of(group) }
diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb
index 3d56468a1c9..2e7b7512b45 100644
--- a/spec/features/security/group/private_access_spec.rb
+++ b/spec/features/security/group/private_access_spec.rb
@@ -27,9 +27,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -47,9 +49,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -69,9 +73,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -89,9 +95,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -109,9 +117,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_denied_for(:maintainer).of(group) }
     it { is_expected.to be_denied_for(:developer).of(group) }
@@ -135,9 +145,11 @@ RSpec.describe 'Private Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
diff --git a/spec/features/security/group/public_access_spec.rb b/spec/features/security/group/public_access_spec.rb
index ac6b8a8ddd1..513c5710c8f 100644
--- a/spec/features/security/group/public_access_spec.rb
+++ b/spec/features/security/group/public_access_spec.rb
@@ -27,9 +27,11 @@ RSpec.describe 'Public Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -47,9 +49,11 @@ RSpec.describe 'Public Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -69,9 +73,11 @@ RSpec.describe 'Public Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -89,9 +95,11 @@ RSpec.describe 'Public Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_allowed_for(:maintainer).of(group) }
     it { is_expected.to be_allowed_for(:developer).of(group) }
@@ -109,9 +117,11 @@ RSpec.describe 'Public Group access', feature_category: :permissions do
     context 'when admin mode is enabled', :enable_admin_mode do
       it { is_expected.to be_allowed_for(:admin) }
     end
+
     context 'when admin mode is disabled' do
       it { is_expected.to be_denied_for(:admin) }
     end
+
     it { is_expected.to be_allowed_for(:owner).of(group) }
     it { is_expected.to be_denied_for(:maintainer).of(group) }
     it { is_expected.to be_denied_for(:developer).of(group) }