Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-02 15:45:01 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-06 12:04:04 +0300
commit79ea01bfaffa743e98716cf9f9f811c6843dea4b (patch)
tree48bf9a5ca5221e5fc61fa36aa76ebdb502d6011a /app/services/ci
parentf9a1814377474bab898cf7511bb02c53c6dc23b7 (diff)
Refactor code related to pipeline blocking actions
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/process_pipeline_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb
index 0a478f91214..24428d9afae 100644
--- a/app/services/ci/process_pipeline_service.rb
+++ b/app/services/ci/process_pipeline_service.rb
@@ -35,9 +35,9 @@ module Ci
if valid_statuses_for_when(build.when).include?(current_status)
build.enqueue
true
- elsif build.can_block?
+ elsif build.barrier?
build.block
- build.is_blocking?
+ false
else
build.skip
false