diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-21 10:51:51 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-21 10:51:51 +0000 |
| commit | 46146e33f2f8dcbd52ee50eb9142887344b8c367 (patch) | |
| tree | 7d0cd02b02d8278df352eb3ee0b21a362d945cb3 /app/models/concerns | |
| parent | 4146be04482f27bc10246dd471c3f08ec258e0ed (diff) | |
| parent | 0b5e1392782b23650cd70ff15388af2e52a4d2b0 (diff) | |
| download | gitlab-ce-46146e33f2f8dcbd52ee50eb9142887344b8c367.tar.gz | |
Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master'
Fix pipeline status for transition between stages
Closes #29699
See merge request !10094
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/has_status.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb index 5101cc7e687..0a1a65da05a 100644 --- a/app/models/concerns/has_status.rb +++ b/app/models/concerns/has_status.rb @@ -31,6 +31,7 @@ module HasStatus WHEN (#{builds})=(#{created})+(#{skipped})+(#{pending}) THEN 'pending' WHEN (#{running})+(#{pending})>0 THEN 'running' WHEN (#{manual})>0 THEN 'manual' + WHEN (#{created})>0 THEN 'running' ELSE 'failed' END)" end |