summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-01 13:38:37 +0900
committerAlessio Caiazza <acaiazza@gitlab.com>2018-10-02 17:08:14 +0200
commitefaa3669c182e68d43b68a1f4257b483aad55f01 (patch)
treed1141ddaed3675dd3ed1cdf67a569a8025676e04
parent70d015d1ba5adde82c6f38567ad51cfb85dae5f6 (diff)
downloadgitlab-ce-efaa3669c182e68d43b68a1f4257b483aad55f01.tar.gz
Change the order of status_sql to avoid the query for scheduled status at the earlier step
-rw-r--r--app/models/concerns/has_status.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 88a0c9919e7..b92643f87f8 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -33,7 +33,6 @@ module HasStatus
warnings = scope_warnings.select('count(*) > 0').to_sql.presence || 'false'
"(CASE
- WHEN (#{scheduled})>0 THEN 'scheduled'
WHEN (#{builds})=(#{skipped}) AND (#{warnings}) THEN 'success'
WHEN (#{builds})=(#{skipped}) THEN 'skipped'
WHEN (#{builds})=(#{success}) THEN 'success'
@@ -43,6 +42,7 @@ module HasStatus
WHEN (#{builds})=(#{created})+(#{skipped})+(#{pending}) THEN 'pending'
WHEN (#{running})+(#{pending})>0 THEN 'running'
WHEN (#{manual})>0 THEN 'manual'
+ WHEN (#{scheduled})>0 THEN 'scheduled'
WHEN (#{created})>0 THEN 'running'
ELSE 'failed'
END)"