Commit 2de641a1 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'revert-protected-environments-group-access-inheritence' into 'master'

Revert Protected Environment group access inheritence

See merge request gitlab-org/gitlab!83573
parents a087a07e 493a1d63
......@@ -25,7 +25,7 @@ module ProtectedEnvironments
return false unless user
return true if user.admin? # rubocop: disable Cop/UserAdmin
return user.id == user_id if user_type?
return group.member?(user) if group_type?
return group.users.exists?(user.id) if group_type?
protected_environment.container_access_level(user) >= access_level
end
......
......@@ -68,19 +68,6 @@ RSpec.shared_examples 'authorizable for protected environments' do |factory_name
it { is_expected.to be_truthy }
end
context 'when there is an inherited member of a group' do
let_it_be(:parent_group) { create(:group) }
let_it_be(:child_group) { create(:group, parent: parent_group, projects: [project])}
let(:authorizable) { create(factory_name, protected_environment: protected_environment, group: child_group) }
before do
parent_group.add_reporter(user)
end
it { is_expected.to be_truthy }
end
context 'when no permissions have been given to a group' do
let(:authorizable) { create(factory_name, :maintainer_access, protected_environment: protected_environment) }
......
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