summaryrefslogtreecommitdiff
path: root/app/policies/group_policy.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-14 12:10:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-14 12:10:40 +0000
commita0d49dc011304985a8fd8a7ab337c003995c8ae1 (patch)
treea596d7ca659be1c02f5cce4d1f7a217c2ca153d6 /app/policies/group_policy.rb
parentefcfe56681dc8bd586e6ef56d1dc7df05a93197d (diff)
downloadgitlab-ce-a0d49dc011304985a8fd8a7ab337c003995c8ae1.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.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index 674d1ddb18b..d9aa204399e 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -84,7 +84,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
condition(:crm_enabled, score: 0, scope: :subject) { @subject.crm_enabled? }
condition(:group_runner_registration_allowed, scope: :global) do
- Feature.disabled?(:runner_registration_control) || Gitlab::CurrentSettings.valid_runner_registrars.include?('group')
+ Gitlab::CurrentSettings.valid_runner_registrars.include?('group')
end
condition(:runners_finder_all_available, scope: :subject) do