summaryrefslogtreecommitdiffstats
path: root/custom
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 /custom
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 'custom')
-rw-r--r--custom/conf/app.example.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 18985e04e9..2ade907993 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -900,6 +900,9 @@ PATH =
;;
;; In default merge messages only include approvers who are official
;DEFAULT_MERGE_MESSAGE_OFFICIAL_APPROVERS_ONLY = true
+;;
+;; Add co-authored-by and co-committed-by trailers if committer does not match author
+;ADD_CO_COMMITTER_TRAILERS = true
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;