Add DefaultMergeStyle option to repository (#14789)

Fixes #12293
2026-04-11 19:03:10 +09:00 · 2021-03-27 09:55:40 -05:00
parent 6b836ac5f7
commit f4d27498bd
11 changed files with 70 additions and 2 deletions
--- a/modules/forms/repo_form.go
+++ b/modules/forms/repo_form.go
@@ -140,6 +140,7 @@ type RepoSettingForm struct {
 	PullsAllowRebaseMerge                 bool
 	PullsAllowSquash                      bool
 	PullsAllowManualMerge                 bool
+	PullsDefaultMergeStyle                string
 	EnableAutodetectManualMerge           bool
 	EnableTimetracker                     bool
 	AllowOnlyContributorsToTrackTime      bool