diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:56:08 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:56:08 +0300 |
| commit | dbfe8597419d409b10ce79daec7f5b39cfad492d (patch) | |
| tree | a3aafb48f0b0427932e15b076f86d0ba4b41755a | |
| parent | 29b2efb61085017eea21c3fa8e7486cdb15054a4 (diff) | |
| download | gitlab-ce-dbfe8597419d409b10ce79daec7f5b39cfad492d.tar.gz | |
[Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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! |