[Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method

dbfe8597 · Valery Sizov · 29b2efb6 · dbfe8597
Commit dbfe8597 authored Sep 29, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1589,7 +1589,7 @@ class Project < ActiveRecord::Base
  end

  def ff_merge_must_be_possible?
-    self.merge_requests_ff_only_enabled
+    self.merge_requests_ff_only_enabled || self.merge_requests_rebase_enabled
  end

  def migrate_to_hashed_storage!