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:53:13 -0500 |
| commit | 049e2f22c9437343b44e7164252157bc7f192e9c (patch) | |
| tree | 2772baf25ada87fe90b6735d620e0616d1cd4862 | |
| parent | c8d66514efcf946f847cb3120b271d8f0f0327f2 (diff) | |
| download | gitlab-ce-049e2f22c9437343b44e7164252157bc7f192e9c.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 c63d0c01653..db85573c72b 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 |