Commit dbfe8597 authored by Valery Sizov's avatar Valery Sizov
Browse files

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

parent 9d1294f10708
...@@ -1589,7 +1589,7 @@ def merge_method=(method) ...@@ -1589,7 +1589,7 @@ def merge_method=(method)
end end
def ff_merge_must_be_possible? def ff_merge_must_be_possible?
self.merge_requests_ff_only_enabled self.merge_requests_ff_only_enabled || self.merge_requests_rebase_enabled
end end
def migrate_to_hashed_storage! def migrate_to_hashed_storage!
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment