diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-19 23:33:42 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-19 23:33:42 +0200 |
| commit | bf9db45a1dc4d8269fa68dc27dac6667c89ffda8 (patch) | |
| tree | 813d6c8151c156d186cdf4e3420f42260d206434 /app/models/concerns/statuseable.rb | |
| parent | 0aedeb5637932fa827e42be7441e9c967049dd1d (diff) | |
| parent | b9ed9d658ad447a64d58b2040849a7cc0e698287 (diff) | |
| download | gitlab-ce-bf9db45a1dc4d8269fa68dc27dac6667c89ffda8.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-predefined-variables
Diffstat (limited to 'app/models/concerns/statuseable.rb')
| -rw-r--r-- | app/models/concerns/statuseable.rb | 6 |
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)" |