diff options
| author | ttys3 <41882455+ttys3@users.noreply.github.com> | 2022-06-03 11:45:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 23:45:54 -0400 |
| commit | 0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209 (patch) | |
| tree | 54ceb9a1bf1e750188f8cce9380e0f6a7898217e /modules | |
| parent | 808a7803098bd86c83185cb823c5b0e2a5b2c56d (diff) | |
| download | gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.tar.gz gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.zip | |
feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section for repo init (#19751)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/setting/repository.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/setting/repository.go b/modules/setting/repository.go index bae4ad1be9..0b90fbc67c 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -71,6 +71,7 @@ var ( WorkInProgressPrefixes []string CloseKeywords []string ReopenKeywords []string + DefaultMergeStyle string DefaultMergeMessageCommitsLimit int DefaultMergeMessageSize int DefaultMergeMessageAllAuthors bool @@ -192,6 +193,7 @@ var ( WorkInProgressPrefixes []string CloseKeywords []string ReopenKeywords []string + DefaultMergeStyle string DefaultMergeMessageCommitsLimit int DefaultMergeMessageSize int DefaultMergeMessageAllAuthors bool @@ -205,6 +207,7 @@ var ( // https://help.github.com/articles/closing-issues-via-commit-messages CloseKeywords: strings.Split("close,closes,closed,fix,fixes,fixed,resolve,resolves,resolved", ","), ReopenKeywords: strings.Split("reopen,reopens,reopened", ","), + DefaultMergeStyle: "merge", DefaultMergeMessageCommitsLimit: 50, DefaultMergeMessageSize: 5 * 1024, DefaultMergeMessageAllAuthors: false, |