diff options
| author | Geoffrey Lalonde <glalonde@google.com> | 2016-03-17 07:54:56 -0700 |
|---|---|---|
| committer | Geoffrey Lalonde <glalonde@google.com> | 2016-03-17 07:55:10 -0700 |
| commit | 4117c815df73ba80258ca472470735826c68753a (patch) | |
| tree | 74d7ea81633a4044dac5620badd3690a8e2e98ed /app | |
| parent | 39fb836c482d653f540531215ccd60b327166651 (diff) | |
| download | gitlab-ce-4117c815df73ba80258ca472470735826c68753a.tar.gz | |
adjusted behavior so canceled builds tagged as allowed to fail do not fail build
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/commit_status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 3b1aa0f5c80..3377a85a55a 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -114,7 +114,7 @@ class CommitStatus < ActiveRecord::Base end def ignored? - failed? && allow_failure? + allow_failure? && (failed? || canceled?) end def duration |