summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2017-12-14 11:53:15 +0000
committerTiago <tiagonbotelho@hotmail.com>2017-12-14 12:16:50 +0000
commit10cfd86a8872c878cd93d76f4f523d7b11e9563e (patch)
tree9fe5812c3f92d0b4bb8dc1c22fbd186937e37562 /app
parentc425722d74ed44b6e5e71af038acc81954b00d5a (diff)
downloadgitlab-ce-10cfd86a8872c878cd93d76f4f523d7b11e9563e.tar.gz
Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual' into 'master'
Dependencies Validator fails when depended job is `manual` Closes #41110 See merge request gitlab-org/gitlab-ce!15924 (cherry picked from commit 57175ecb5060dac145abc048b6e88642bc1aa82b) 1def948b Dependencies Validator fails when depended job is `manual`
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 85960f1b6bb..83fe23606d1 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -491,7 +491,6 @@ module Ci
end
def valid_dependency?
- return false unless complete?
return false if artifacts_expired?
return false if erased?