diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 06:09:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 06:09:12 +0000 |
commit | 8ac8716da0de5da9f63ac81a444fe81287c19b6b (patch) | |
tree | 99f438f413d895b2bdb7dda4a47285e567513823 /lib | |
parent | c49e17ea3715f780cdbbef84f52a8808f98a301e (diff) | |
download | gitlab-ce-8ac8716da0de5da9f63ac81a444fe81287c19b6b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/pipeline/seed/build/resource_group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/seed/build/resource_group.rb b/lib/gitlab/ci/pipeline/seed/build/resource_group.rb index 100eb1d4084..3bec6d1e8b6 100644 --- a/lib/gitlab/ci/pipeline/seed/build/resource_group.rb +++ b/lib/gitlab/ci/pipeline/seed/build/resource_group.rb @@ -16,7 +16,7 @@ module Gitlab end def to_resource - return unless Feature.enabled?(:ci_resource_group, build.project) + return unless Feature.enabled?(:ci_resource_group, build.project, default_enabled: true) return unless resource_group_key.present? resource_group = build.project.resource_groups |