summaryrefslogtreecommitdiff
path: root/app/models/concerns
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/models/concerns
parent5b119a9dc85943b3f60868a347a814e767c9840c (diff)
downloadgitlab-ce-640924e4a23dcfe1e8d6b616e822bfc7fce56d8f.tar.gz
Mark builds with manual actions as skipped
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/statuseable.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb
index 3ef91caad47..44c6b30f278 100644
--- a/app/models/concerns/statuseable.rb
+++ b/app/models/concerns/statuseable.rb
@@ -16,10 +16,10 @@ module Statuseable
deduce_status = "(CASE
WHEN (#{builds})=0 THEN NULL
- WHEN (#{builds})=(#{success})+(#{ignored}) THEN 'success'
- WHEN (#{builds})=(#{pending}) THEN 'pending'
- WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored}) THEN 'canceled'
WHEN (#{builds})=(#{skipped}) THEN 'skipped'
+ WHEN (#{builds})=(#{success})+(#{ignored})+(#{skipped}) THEN 'success'
+ WHEN (#{builds})=(#{pending})+(#{skipped}) THEN 'pending'
+ WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored})+(#{skipped}) THEN 'canceled'
WHEN (#{running})+(#{pending})>0 THEN 'running'
ELSE 'failed'
END)"