From 0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209 Mon Sep 17 00:00:00 2001
From: ttys3 <41882455+ttys3@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:45:54 +0800
Subject: feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section
 for repo init (#19751)

---
 modules/setting/repository.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/setting')

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,
-- 
cgit v1.2.3