diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-14 00:10:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-14 00:10:45 +0000 |
| commit | c7e53e67898682ac7ccb61525f66980989ddb75e (patch) | |
| tree | 2b79592f82d78bbe393af80f73e5917f2b68540e /app/policies/group_policy.rb | |
| parent | 2d4f258f067f55894862e47ec32bbc54649d4741 (diff) | |
| download | gitlab-ce-c7e53e67898682ac7ccb61525f66980989ddb75e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/group_policy.rb')
| -rw-r--r-- | app/policies/group_policy.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index ffe908593ae..96cfa5c3e6c 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -228,8 +228,9 @@ class GroupPolicy < BasePolicy rule { dependency_proxy_access_allowed & dependency_proxy_available } .enable :read_dependency_proxy - rule { developer & dependency_proxy_available } - .enable :admin_dependency_proxy + rule { developer & dependency_proxy_available }.policy do + enable :admin_dependency_proxy + end rule { can?(:admin_group) & resource_access_token_feature_available }.policy do enable :read_resource_access_tokens |