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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/setting/repository.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/setting/repository.go b/modules/setting/repository.go index a6fc73651a..a7666895e1 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -78,6 +78,7 @@ var ( DefaultMergeMessageAllAuthors bool DefaultMergeMessageMaxApprovers int DefaultMergeMessageOfficialApproversOnly bool + PopulateSquashCommentWithCommitMessages bool } `ini:"repository.pull-request"` // Issue Setting @@ -199,6 +200,7 @@ var ( DefaultMergeMessageAllAuthors bool DefaultMergeMessageMaxApprovers int DefaultMergeMessageOfficialApproversOnly bool + PopulateSquashCommentWithCommitMessages bool }{ WorkInProgressPrefixes: []string{"WIP:", "[WIP]"}, // Same as GitHub. See @@ -210,6 +212,7 @@ var ( DefaultMergeMessageAllAuthors: false, DefaultMergeMessageMaxApprovers: 10, DefaultMergeMessageOfficialApproversOnly: true, + PopulateSquashCommentWithCommitMessages: false, }, // Issue settings |