diff options
| author | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2019-06-21 17:46:47 +0200 |
|---|---|---|
| committer | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2019-06-21 17:46:47 +0200 |
| commit | 9d339b97aa548323376370950226b57081742b81 (patch) | |
| tree | 36ffb12a74ab42d643ca316b37a892b42237bdb3 | |
| parent | a536c543d26aa2347c4e3b2bf8549c7c8c045511 (diff) | |
| download | gitlab-ce-49081-dont-run-auto-devops-when-no-runner-present.tar.gz | |
Fix implicitly disabled condition49081-dont-run-auto-devops-when-no-runner-present
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0dd5e582e86..594a2fbfb90 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -679,11 +679,9 @@ class Project < ApplicationRecord end def has_auto_devops_implicitly_disabled? - return true unless any_runners? - auto_devops_config = first_auto_devops_config - auto_devops_config[:scope] != :project && !auto_devops_config[:status] + auto_devops_config[:scope] != :project && (!auto_devops_config[:status] || !any_runners?) end def first_auto_devops_config |