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-03 16:35:19 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-06 12:04:04 +0300
commitac5bd3b73c0255bb9307913a2d4338d0a431cac6 (patch)
tree7c95aad0abec0692e448b60f2d5ccf9d59919427 /app/services/ci
parentdd2409119183578b12148654899e8e29c6105572 (diff)
Reinstitute a core `manual` status for manual 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 30fccbddc33..c70b75cc577 100644
--- a/app/services/ci/process_pipeline_service.rb
+++ b/app/services/ci/process_pipeline_service.rb
@@ -37,8 +37,8 @@ module Ci
if valid_statuses_for_when(build.when).include?(current_status)
build.enqueue
true
- elsif build.barrier?
- build.block
+ elsif build.action? && build.barrier?
+ build.actionize
false
else
build.skip