diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-18 09:44:22 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-27 14:16:01 +0200 |
| commit | bdb86ea6cfe16cd3c1e8197744fa3328ba93ecf2 (patch) | |
| tree | e3f7cce5af46519cb0544e455fdc50ca0357bf94 /app/models/concerns | |
| parent | c01ff1f54b55a60f7c7473d0d8a429d5cf9c1609 (diff) | |
| download | gitlab-ce-bdb86ea6cfe16cd3c1e8197744fa3328ba93ecf2.tar.gz | |
Render canceled status if any of the jobs canceled
This status will be returned only when there are no failed jobs
that are not allowed to fail.
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/statuseable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb index 8a293b7b76e..3ef91caad47 100644 --- a/app/models/concerns/statuseable.rb +++ b/app/models/concerns/statuseable.rb @@ -18,7 +18,7 @@ module Statuseable WHEN (#{builds})=0 THEN NULL WHEN (#{builds})=(#{success})+(#{ignored}) THEN 'success' WHEN (#{builds})=(#{pending}) THEN 'pending' - WHEN (#{builds})=(#{canceled}) THEN 'canceled' + WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored}) THEN 'canceled' WHEN (#{builds})=(#{skipped}) THEN 'skipped' WHEN (#{running})+(#{pending})>0 THEN 'running' ELSE 'failed' |