summaryrefslogtreecommitdiff
path: root/app/models/commit_status.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-19 19:58:43 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-19 19:58:43 +0100
commitaa812dbfcc693f82e1a9b16e0e894d2800938d9e (patch)
tree61a6b0abfe2ab6fc220c06c3a6a65916e5cd4e3b /app/models/commit_status.rb
parent1817b766b2bdf03e886118bda5e1aee48b5c2413 (diff)
downloadgitlab-ce-aa812dbfcc693f82e1a9b16e0e894d2800938d9e.tar.gz
Fix missing ignored? for GenericCommitStatuscommit-status-fix
Diffstat (limited to 'app/models/commit_status.rb')
-rw-r--r--app/models/commit_status.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 66e0502fc0c..434b3560d09 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -113,6 +113,10 @@ class CommitStatus < ActiveRecord::Base
canceled? || success? || failed?
end
+ def ignored?
+ failed? && allow_failure?
+ end
+
def duration
if started_at && finished_at
finished_at - started_at