From dbfe8597419d409b10ce79daec7f5b39cfad492d Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Fri, 29 Sep 2017 19:56:08 +0300 Subject: [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index fe442755619..486683b839f 100644 --- 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! -- cgit v1.2.1