aboutsummaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-11-29 07:09:55 +0000
committerGitHub <noreply@github.com>2021-11-29 07:09:55 +0000
commitb5a9ee94fd1f3bbe35bd19dfc4c7025e9f8e0768 (patch)
treee652f3bdb8c9886c70289542b300bed8fd9f446f /modules/setting
parent3fec2cb3d3957f8260ce42163a5197a8551b8390 (diff)
downloadgitea-b5a9ee94fd1f3bbe35bd19dfc4c7025e9f8e0768.tar.gz
gitea-b5a9ee94fd1f3bbe35bd19dfc4c7025e9f8e0768.zip
Make Co-committed-by and co-authored-by trailers optional (#17848)
This PR adds another option to app.ini make co-committed-by and co-authored-by trailers optional on a per server basis. Fix #17194 Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/repository.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 0791602efb..d2c0e205d5 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -76,6 +76,7 @@ var (
DefaultMergeMessageMaxApprovers int
DefaultMergeMessageOfficialApproversOnly bool
PopulateSquashCommentWithCommitMessages bool
+ AddCoCommitterTrailers bool
} `ini:"repository.pull-request"`
// Issue Setting
@@ -196,6 +197,7 @@ var (
DefaultMergeMessageMaxApprovers int
DefaultMergeMessageOfficialApproversOnly bool
PopulateSquashCommentWithCommitMessages bool
+ AddCoCommitterTrailers bool
}{
WorkInProgressPrefixes: []string{"WIP:", "[WIP]"},
// Same as GitHub. See
@@ -208,6 +210,7 @@ var (
DefaultMergeMessageMaxApprovers: 10,
DefaultMergeMessageOfficialApproversOnly: true,
PopulateSquashCommentWithCommitMessages: false,
+ AddCoCommitterTrailers: true,
},
// Issue settings