Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 28 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 3ef859376a4..c513baea517 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -4,7 +4,6 @@ require 'spec_helper'
 
 RSpec.describe GroupPolicy do
   include_context 'GroupPolicy context'
-  using RSpec::Parameterized::TableSyntax
 
   context 'public group with no user' do
     let(:group) { create(:group, :public, :crm_enabled) }
@@ -1230,30 +1229,4 @@ RSpec.describe GroupPolicy do
     it { is_expected.to be_disallowed(:admin_crm_contact) }
     it { is_expected.to be_disallowed(:admin_crm_organization) }
   end
-
-  describe 'maintain_namespace' do
-    context 'with non-admin roles' do
-      where(:role, :allowed) do
-        :guest      | false
-        :reporter   | false
-        :developer  | false
-        :maintainer | true
-        :owner      | true
-      end
-
-      with_them do
-        let(:current_user) { public_send(role) }
-
-        it do
-          expect(subject.allowed?(:maintain_namespace)).to eq allowed
-        end
-      end
-    end
-
-    context 'as an admin', :enable_admin_mode do
-      let(:current_user) { admin }
-
-      it { is_expected.to be_allowed(:maintain_namespace) }
-    end
-  end
 end
diff --git a/spec/policies/namespaces/user_namespace_policy_spec.rb b/spec/policies/namespaces/user_namespace_policy_spec.rb
index e8a3c9b828d..22c3f6a6d67 100644
--- a/spec/policies/namespaces/user_namespace_policy_spec.rb
+++ b/spec/policies/namespaces/user_namespace_policy_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Namespaces::UserNamespacePolicy do
   let_it_be(:admin) { create(:admin) }
   let_it_be(:namespace) { create(:user_namespace, owner: owner) }
 
-  let(:owner_permissions) { [:owner_access, :create_projects, :admin_namespace, :read_namespace, :read_statistics, :transfer_projects, :admin_package, :maintain_namespace] }
+  let(:owner_permissions) { [:owner_access, :create_projects, :admin_namespace, :read_namespace, :read_statistics, :transfer_projects, :admin_package] }
 
   subject { described_class.new(current_user, namespace) }