diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-02-19 19:22:25 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-02-19 19:22:25 +0000 |
| commit | bcc23320618c861491add3439abe783ef9b19b37 (patch) | |
| tree | 446bfc8c0ba2112847c5b5c8ad6d5b94c5f174c3 /app/models/commit_status.rb | |
| parent | 94915f97de49203e81600d06eceed5e03fa25e60 (diff) | |
| parent | aa812dbfcc693f82e1a9b16e0e894d2800938d9e (diff) | |
| download | gitlab-ce-bcc23320618c861491add3439abe783ef9b19b37.tar.gz | |
Merge branch 'commit-status-fix' into 'master'
Fix missing ignored? for GenericCommitStatus
This is pretty important fix. We should not release 8.5 without this.
It critical error when handling GenericCommitStatus:
```
undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0>
```
cc @grzesiek
See merge request !2899
Diffstat (limited to 'app/models/commit_status.rb')
| -rw-r--r-- | app/models/commit_status.rb | 4 |
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 |