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

feat: add DEFAULT_MERGE_STYLE to repository.pull-request section for repo init (#19751)

Browse Source
This commit is contained in:
ttys3
2022-06-03 11:45:54 +08:00
committed by GitHub
parent 808a780309
commit 0c759fd4de
6 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
models/repo/repo_unit.go
View File

@@ -11,6 +11,7 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
@@ -148,6 +149,10 @@ func (cfg *PullRequestsConfig) GetDefaultMergeStyle() MergeStyle {
return cfg.DefaultMergeStyle
}
if setting.Repository.PullRequest.DefaultMergeStyle != "" {
return MergeStyle(setting.Repository.PullRequest.DefaultMergeStyle)
}
return MergeStyleMerge
}