From aa812dbfcc693f82e1a9b16e0e894d2800938d9e Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 19 Feb 2016 19:58:43 +0100 Subject: Fix missing ignored? for GenericCommitStatus --- app/models/ci/build.rb | 4 ---- app/models/commit_status.rb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/models') diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 623edd8bc57..7a641cfd998 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -116,10 +116,6 @@ module Ci end end - def ignored? - failed? && allow_failure? - end - def retryable? project.builds_enabled? && commands.present? end 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 -- cgit v1.2.1