summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-12-07 19:59:01 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-12-07 19:59:01 +0000
commitaf4d4e7067525e02eb2c17d2d0c524621c8ed345 (patch)
treeab20c3fadf806bbaf2ceb0aaa59f2301b6133c4a /app/services
parent1c02af274e6f7bc0959235c01105ca5b43178c06 (diff)
parent2ac6d806900f3aea708b3fcdc32463235f83eb73 (diff)
downloadgitlab-ce-af4d4e7067525e02eb2c17d2d0c524621c8ed345.tar.gz
Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into 'master'
Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/register_job_service.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index 2ef76e03031..c8b6450c9b5 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -54,6 +54,9 @@ module Ci
# we still have to return 409 in the end,
# to make sure that this is properly handled by runner.
valid = false
+ rescue Ci::Build::MissingDependenciesError
+ build.drop!(:missing_dependency_failure)
+ valid = false
end
end