Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-07 03:28:52 +02:00
Code Issues Activity

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

Browse Source
This commit is contained in:
ttys3 authored and GitHub committed 2022-06-02 23:45:54 -04:00
1 parent 808a780309
commit 0c759fd4de
6 files changed
+15 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

models/repo/repo_unit.go
+5
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
}