diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-19 11:40:43 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-19 11:40:43 -0500 |
| commit | c7264d2a76abdc9d173e2160e27974d41380e93f (patch) | |
| tree | f2ddcc87becb62f41a23ffc7d60dcb98121d4d26 | |
| parent | d1938fae3d9a6f4d31576461fae3efb4f09686c4 (diff) | |
| download | gitlab-ce-c7264d2a76abdc9d173e2160e27974d41380e93f.tar.gz | |
Check if MR is not broken.
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a9fc6bc167a..9511521879b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -254,7 +254,7 @@ class MergeRequest < ActiveRecord::Base end def mergeable? - return false unless open? && !work_in_progress? + return false unless open? && !work_in_progress? && !broken? check_if_can_be_merged |