Check if MR is not broken.

2016-01-19 11:40:43 -05:00 · 2016-01-19 11:40:43 -05:00 · c7264d2a76
parent d1938fae3d
commit c7264d2a76
1 changed files with 1 additions and 1 deletions
--- 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