diff options
| author | zeripath <art27@cantab.net> | 2019-12-30 23:34:11 +0000 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-30 18:34:11 -0500 |
| commit | 0c07f1de5b8cf7b9f9f607aae76a53c99aeb2c04 (patch) | |
| tree | d9dcb3161784f012ae80429aae8a9576894e0fd2 /custom | |
| parent | b983ff447387d40700ad8c0a56f90052878fec98 (diff) | |
| download | gitea-0c07f1de5b8cf7b9f9f607aae76a53c99aeb2c04.tar.gz gitea-0c07f1de5b8cf7b9f9f607aae76a53c99aeb2c04.zip | |
Provide Default messages for merges (#9393)
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/conf/app.ini.sample | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index c9ca821280..b082bc40f1 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -76,6 +76,16 @@ WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP] CLOSE_KEYWORDS=close,closes,closed,fix,fixes,fixed,resolve,resolves,resolved ; List of keywords used in Pull Request comments to automatically reopen a related issue REOPEN_KEYWORDS=reopen,reopens,reopened +; In the default merge message for squash commits include at most this many commits +DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT=50 +; In the default merge message for squash commits limit the size of the commit messages to this +DEFAULT_MERGE_MESSAGE_SIZE=5120 +; 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_ALL_AUTHORS=false +; In default merge messages limit the number of approvers listed as Reviewed-by: to this many +DEFAULT_MERGE_MESSAGE_MAX_APPROVERS=10 +; In default merge messages only include approvers who are official +DEFAULT_MERGE_MESSAGE_OFFICIAL_APPROVERS_ONLY=true [repository.issue] ; List of reasons why a Pull Request or Issue can be locked |