diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-03 15:13:50 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-06 10:04:04 +0100 |
| commit | d87132b46344b460bb8cba87df48218f65df29f3 (patch) | |
| tree | 1ff6f0e7aff661daef37635a12c16622b1f2e6cd /app/services | |
| parent | 53fcede5c0837eb53dcf67a9abf7d7b779bd1e25 (diff) | |
| download | gitlab-ce-d87132b46344b460bb8cba87df48218f65df29f3.tar.gz | |
Always actionize build when it is a manual action
Do not skip manual actions even if actions are optional.
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/process_pipeline_service.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb index c70b75cc577..2935d00c075 100644 --- a/app/services/ci/process_pipeline_service.rb +++ b/app/services/ci/process_pipeline_service.rb @@ -35,11 +35,8 @@ module Ci def process_build(build, current_status) if valid_statuses_for_when(build.when).include?(current_status) - build.enqueue + build.action? ? build.actionize : build.enqueue true - elsif build.action? && build.barrier? - build.actionize - false else build.skip false @@ -54,6 +51,8 @@ module Ci %w[failed] when 'always' %w[success failed skipped] + when 'manual' + %w[success] else [] end |