summaryrefslogtreecommitdiff
path: root/app/services/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 14:48:36 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-07-18 14:48:36 +0200
commit640924e4a23dcfe1e8d6b616e822bfc7fce56d8f (patch)
tree5a622fccb8967d262c4d6315d731320cd70c3e06 /app/services/ci
parent5b119a9dc85943b3f60868a347a814e767c9840c (diff)
downloadgitlab-ce-640924e4a23dcfe1e8d6b616e822bfc7fce56d8f.tar.gz
Mark builds with manual actions as skipped
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/create_builds_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 3b21f0acb96..e4eb75598a2 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -15,7 +15,7 @@ module Ci
status == 'success'
when 'on_failure'
status == 'failed'
- when 'always'
+ when 'always', 'manual'
%w(success failed).include?(status)
end
end
@@ -47,6 +47,8 @@ module Ci
user: user,
project: @pipeline.project)
+ build_attrs[:status] = 'skipped' if build_attrs[:when] == 'manual'
+
##
# We do not persist new builds here.
# Those will be persisted when @pipeline is saved.