diff options
Diffstat (limited to 'modules/forms/repo_form.go')
| -rw-r--r-- | modules/forms/repo_form.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/forms/repo_form.go b/modules/forms/repo_form.go index 6c7c9bea13..d9eb06d194 100644 --- 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 |