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 /app | |
| parent | c49e17ea3715f780cdbbef84f52a8808f98a301e (diff) | |
| download | gitlab-ce-8ac8716da0de5da9f63ac81a444fe81287c19b6b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5324d59c155..5edd2f52fc8 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -481,7 +481,7 @@ module Ci end def requires_resource? - Feature.enabled?(:ci_resource_group, project) && + Feature.enabled?(:ci_resource_group, project, default_enabled: true) && self.resource_group_id.present? end |