Rebase and Merge with One Click settings migration
- Add a database migration on the projects table to add an additional column
rebase_and_merge_with_one_click
. - Enforce validation on
rebase_and_merge_with_one_click
so it can only betrue
whenMerge commit with semi-linear history
orfast-forward merge
methods are selected. - This column should default to
true
if the above condition is met, and benot NULL
. - This validation should also be duplicated on the Project model.
Edited by Fred Reinink