Check if MR is not broken.

c7264d2a · Rubén Dávila · d1938fae · c7264d2a
Commit c7264d2a authored Jan 19, 2016 by Rubén Dávila
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/merge_request.rb app/models/merge_request.rb +1 -1

No files found.
--- 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