tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add DefaultMergeStyle option to repository (#14789)

Browse Source 
Fixes #12293
This commit is contained in:
parnic
2021-03-27 09:55:40 -05:00
committed by GitHub
parent 6b836ac5f7
commit f4d27498bd
11 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/forms/repo_form.go
View File

@@ -140,6 +140,7 @@ type RepoSettingForm struct {
PullsAllowRebaseMerge bool
PullsAllowSquash bool
PullsAllowManualMerge bool
PullsDefaultMergeStyle string
EnableAutodetectManualMerge bool
EnableTimetracker bool
AllowOnlyContributorsToTrackTime bool