public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-16 12:05:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add DefaultMergeStyle option to repository (#14789)

Browse Source 
Fixes #12293
This commit is contained in:
parnic authored and GitHub committed 2021-03-27 15:55:40 +01:00
1 parent 6b836ac5f7
commit f4d27498bd
11 files changed
+70 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/forms/repo_form.go
+1
View File
@@ -140,6 +140,7 @@ type RepoSettingForm struct {
PullsAllowRebaseMerge bool
PullsAllowSquash bool
PullsAllowManualMerge bool
PullsDefaultMergeStyle string
EnableAutodetectManualMerge bool
EnableTimetracker bool
AllowOnlyContributorsToTrackTime bool