diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 21:43:11 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 21:43:11 +0100 |
| commit | f66454beaa880d283ef527c3a32a3076fedf6551 (patch) | |
| tree | 6852eca364013dd171727b2795de0993563af91b /app/models | |
| parent | 792f2bbe0b306bda266dfc817edf33b4c9e36a0f (diff) | |
| download | gitlab-ce-f66454beaa880d283ef527c3a32a3076fedf6551.tar.gz | |
Add indication to merge request list item that MR cannot be merged automatically
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 080b7f7fb88..1f84dc2a577 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -484,4 +484,8 @@ class MergeRequest < ActiveRecord::Base source_project.ci_commit(last_commit.id) end end + + def broken? + self.commits.blank? || branch_missing? || cannot_be_merged? + end end |