diff options
| author | parnic <github@parnic.com> | 2021-06-18 17:08:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-19 00:08:22 +0200 |
| commit | 35742d4af72da3cf6262fbacc688d53db88b68a6 (patch) | |
| tree | 5b01b61666e6a3e31dc58f5e3efaeecf04f6eccc /docs | |
| parent | 889dea8fc1e78b0d915b27f122df116e7296336d (diff) | |
| download | gitea-35742d4af72da3cf6262fbacc688d53db88b68a6.tar.gz gitea-35742d4af72da3cf6262fbacc688d53db88b68a6.zip | |
Reintroduce squash merge default comment as a config setting (#16134)
* Reinstate most of commit 09304db9a5d88c035a96f74a4544572bc8c5dac0
* Move the behaviour behind a config setting
* Also fix the initial #12365
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 3 |
1 files changed, 2 insertions, 1 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 cfe9f6cc9d..4f84e2ac33 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -94,10 +94,11 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `REOPEN_KEYWORDS`: **reopen**, **reopens**, **reopened**: List of keywords used in Pull Request comments to automatically reopen a related issue - `DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT`: **50**: In the default merge message for squash commits include at most this many commits. Set to `-1` to include all commits -- `DEFAULT_MERGE_MESSAGE_SIZE`: **5120**: In the default merge message for squash commits limit the size of the commit messages. Set to `-1` to have no limit. +- `DEFAULT_MERGE_MESSAGE_SIZE`: **5120**: In the default merge message for squash commits limit the size of the commit messages. Set to `-1` to have no limit. Only used if `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES` is `true`. - `DEFAULT_MERGE_MESSAGE_ALL_AUTHORS`: **false**: In the default merge message for squash commits walk all commits to include all authors in the Co-authored-by otherwise just use those in the limited list - `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. ### Repository - Issue (`repository.issue`) |