Commit 4ed3762b authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'remove-ff-ci_resource_group' into 'master'

Remove FF ci_resource_group

See merge request gitlab-org/gitlab!30590
parents 4178a65b 1ec2accf
......@@ -486,8 +486,7 @@ module Ci
end
def requires_resource?
Feature.enabled?(:ci_resource_group, project, default_enabled: true) &&
self.resource_group_id.present?
self.resource_group_id.present?
end
def has_environment?
......
......@@ -16,7 +16,6 @@ module Gitlab
end
def to_resource
return unless Feature.enabled?(:ci_resource_group, build.project, default_enabled: true)
return unless resource_group_key.present?
resource_group = build.project.resource_groups
......
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