diff options
| author | zeripath <art27@cantab.net> | 2021-11-29 07:09:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 07:09:55 +0000 |
| commit | b5a9ee94fd1f3bbe35bd19dfc4c7025e9f8e0768 (patch) | |
| tree | e652f3bdb8c9886c70289542b300bed8fd9f446f /docs | |
| parent | 3fec2cb3d3957f8260ce42163a5197a8551b8390 (diff) | |
| download | gitea-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 'docs')
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 32c2af3b57..030ca7b36b 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -98,6 +98,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `DEFAULT_MERGE_MESSAGE_MAX_APPROVERS`: **10**: In default merge messages limit the number of approvers listed as `Reviewed-by:`. Set to `-1` to include all. - `DEFAULT_MERGE_MESSAGE_OFFICIAL_APPROVERS_ONLY`: **true**: In default merge messages only include approvers who are officially allowed to review. - `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`: **false**: In default squash-merge messages include the commit message of all commits comprising the pull request. +- `ADD_CO_COMMITTER_TRAILERS`: **true**: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author. ### Repository - Issue (`repository.issue`) |