diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 15:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 15:08:19 +0300 |
| commit | 12b995e0e7aace4b7695c4424aed71b053c2c2a6 (patch) | |
| tree | 0f2c9a902693aa5b7c9265c3ed24e842eedb6a96 /app/policies | |
| parent | 1e02d1c756e1b5e79453fcc805c9737bb6520fca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index fd1c642ad50..858c145de3f 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -83,8 +83,8 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy with_scope :subject condition(:crm_enabled, score: 0, scope: :subject) { @subject.crm_enabled? } - condition(:group_runner_registration_allowed, scope: :global) do - Gitlab::CurrentSettings.valid_runner_registrars.include?('group') + condition(:group_runner_registration_allowed, scope: :subject) do + Gitlab::CurrentSettings.valid_runner_registrars.include?('group') && @subject.runner_registration_enabled? end rule { can?(:read_group) & design_management_enabled }.policy do |