Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-02 16:35:19 +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

1
modules/git/tests/repos/templates_repo/COMMIT_EDITMSG Normal file
View file

@ -0,0 +1 @@
Initial

1
modules/git/tests/repos/templates_repo/HEAD Normal file
View file

@ -0,0 +1 @@
ref: refs/heads/master

5
modules/git/tests/repos/templates_repo/config Normal file
View file

@ -0,0 +1,5 @@
[core]
repositoryformatversion = 0
filemode = true
bare = true
logallrefupdates = true

1
modules/git/tests/repos/templates_repo/description Normal file
View file

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

BIN
modules/git/tests/repos/templates_repo/index Normal file
View file

Binary file not shown.

6
modules/git/tests/repos/templates_repo/info/exclude Normal file
View file

@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~

1
modules/git/tests/repos/templates_repo/info/refs Normal file
View file

@ -0,0 +1 @@
45697427ce0595075c5c8efa42567f050208510d refs/heads/master

BIN
modules/git/tests/repos/templates_repo/objects/info/commit-graph Normal file
View file

Binary file not shown.

2
modules/git/tests/repos/templates_repo/objects/info/packs Normal file
View file

@ -0,0 +1,2 @@
P pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack

BIN
modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.bitmap Normal file
View file

Binary file not shown.

BIN
modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.idx Normal file
View file

Binary file not shown.

BIN
modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack Normal file
View file

Binary file not shown.

2
modules/git/tests/repos/templates_repo/packed-refs Normal file
View file

@ -0,0 +1,2 @@
# pack-refs with: peeled fully-peeled sorted
45697427ce0595075c5c8efa42567f050208510d refs/heads/master

0
modules/git/tests/repos/templates_repo/refs/heads/.gitkeep Normal file
View file

0
modules/git/tests/repos/templates_repo/refs/tags/.gitkeep Normal file
View file