Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-05 01:45:22 +02:00
Code Issues Releases Activity

feat: introduce global merge message templates (#8347)

Browse source 
Allow for a directory `default_merge_message` in the `CustomPath` to be used as a fallback if no merge template is specified by the repository. Effectively being a global merge message template feature.

Resolves #6648

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8347
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: kochklops <kochklops@noreply.codeberg.org>
Co-committed-by: kochklops <kochklops@noreply.codeberg.org>
This commit is contained in:
kochklops 2025-07-12 16:00:42 +02:00 • committed by Gusted
parent f666b882a8
commit 9f5e1157f0
20 changed files with 148 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/repo/git.go
View file

@ -29,6 +29,8 @@ const (
MergeStyleRebaseUpdate MergeStyle = "rebase-update-only"
)
var MergeStyles = []MergeStyle{MergeStyleMerge, MergeStyleRebase, MergeStyleRebaseMerge, MergeStyleSquash, MergeStyleFastForwardOnly, MergeStyleManuallyMerged, MergeStyleRebaseUpdate}
type UpdateStyle string
const (