Commit 886126ab authored by Kerri Miller's avatar Kerri Miller

Merge branch 'ak/ff' into 'master'

Remove feature flag :disable_shared_runners_on_group

See merge request gitlab-org/gitlab!44623
parents 17bc419a eee8efdf
...@@ -52,7 +52,7 @@ class Projects::RunnersController < Projects::ApplicationController ...@@ -52,7 +52,7 @@ class Projects::RunnersController < Projects::ApplicationController
end end
def toggle_shared_runners def toggle_shared_runners
if Feature.enabled?(:disable_shared_runners_on_group, default_enabled: true) && !project.shared_runners_enabled && project.group && project.group.shared_runners_setting == 'disabled_and_unoverridable' if !project.shared_runners_enabled && project.group && project.group.shared_runners_setting == 'disabled_and_unoverridable'
return redirect_to project_runners_path(@project), alert: _("Cannot enable shared runners because parent group does not allow it") return redirect_to project_runners_path(@project), alert: _("Cannot enable shared runners because parent group does not allow it")
end end
......
...@@ -393,7 +393,6 @@ class Namespace < ApplicationRecord ...@@ -393,7 +393,6 @@ class Namespace < ApplicationRecord
end end
def changing_shared_runners_enabled_is_allowed def changing_shared_runners_enabled_is_allowed
return unless Feature.enabled?(:disable_shared_runners_on_group, default_enabled: true)
return unless new_record? || changes.has_key?(:shared_runners_enabled) return unless new_record? || changes.has_key?(:shared_runners_enabled)
if shared_runners_enabled && has_parent? && parent.shared_runners_setting == 'disabled_and_unoverridable' if shared_runners_enabled && has_parent? && parent.shared_runners_setting == 'disabled_and_unoverridable'
...@@ -402,7 +401,6 @@ class Namespace < ApplicationRecord ...@@ -402,7 +401,6 @@ class Namespace < ApplicationRecord
end end
def changing_allow_descendants_override_disabled_shared_runners_is_allowed def changing_allow_descendants_override_disabled_shared_runners_is_allowed
return unless Feature.enabled?(:disable_shared_runners_on_group, default_enabled: true)
return unless new_record? || changes.has_key?(:allow_descendants_override_disabled_shared_runners) return unless new_record? || changes.has_key?(:allow_descendants_override_disabled_shared_runners)
if shared_runners_enabled && !new_record? if shared_runners_enabled && !new_record?
......
...@@ -1195,7 +1195,6 @@ class Project < ApplicationRecord ...@@ -1195,7 +1195,6 @@ class Project < ApplicationRecord
end end
def changing_shared_runners_enabled_is_allowed def changing_shared_runners_enabled_is_allowed
return unless Feature.enabled?(:disable_shared_runners_on_group, default_enabled: true)
return unless new_record? || changes.has_key?(:shared_runners_enabled) return unless new_record? || changes.has_key?(:shared_runners_enabled)
if shared_runners_enabled && group && group.shared_runners_setting == 'disabled_and_unoverridable' if shared_runners_enabled && group && group.shared_runners_setting == 'disabled_and_unoverridable'
......
---
name: disable_shared_runners_on_group
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36080
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258991
type: development
group: group::runner
default_enabled: true
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