diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-05 18:09:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-05 18:09:43 +0000 |
| commit | 38ceebb9b3a541f8530b379d5b5ab5e13ffc58ed (patch) | |
| tree | 7a0494f677459f96e6deda30da4069b7c038eca4 /app/models/ci | |
| parent | 0d09054d162458364ce3fc431506c182e2a5fa4f (diff) | |
| download | gitlab-ce-38ceebb9b3a541f8530b379d5b5ab5e13ffc58ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index bfa6fc7c17e..abf75a21404 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -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? |