Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-01 09:38:39 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-10-01 09:38:39 +0300
commitf0002da09c0f8ae4fb9f732c2e225c9affd98b04 (patch)
treeb0d62e75c40d06c7a956d1f756b11cd139b6f7c1 /app/models/concerns
parent33bbfd277b94ecdf3cb8ffdfc973bbfb67b54810 (diff)
Add a test for on_failure jobs in the middle
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/has_status.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 5a6c2725354..582fe8bb1a7 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -72,6 +72,7 @@ module HasStatus
quoted_when = connection.quote_column_name('when')
# We want to ignore skipped manual jobs
where("#{quoted_when} <> ? OR status <> ?", 'manual', 'skipped').
+ # We want to ignore skipped on_failure
where("#{quoted_when} <> ? OR status <> ?", 'on_failure', 'skipped')
end
end