3bd7ea4c9f
refactor: GetDiffShortStat and fix panic caused by inconsistent "changed file number" ( #39248 )
2026-09-06 05:20:42 +00:00
2657756cac
enhance: fall back to DEFAULT_TEMPLATE.md when style-specific template is missing ( #38803 )
...
Closes #38801
Introduce `DEFAULT_TEMPLATE.md` as the default message for all merge
styles.
https://gitea.com/gitea/docs/pulls/491
By the way, fix incorrect os.Expand usage for merge message & repo
template
---------
Co-authored-by: waterWang <waterWang@users.noreply.github.com >
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2026-08-07 14:11:03 +00:00
82ea2387e4
Always use an empty line to separate the commit message and trailer ( #34512 )
...
If the message from form.MergeMessageField is empty, we will miss a "\n"
between the title and the "Co-authored-by:" line. The title and message
should have a blank line between of them.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2025-06-02 06:29:16 +00:00
47efba78ec
Support template for merge message description ( #22248 )
...
Fix #21435 .
Use the first line of the template as the git commit message title, and
the rest as the description.
## Snapshots
<img width="806" alt="image"
src="https://user-images.githubusercontent.com/9418365/209644083-5d85179c-cf58-404f-bc98-c662398a2411.png ">
<img width="860" alt="image"
src="https://user-images.githubusercontent.com/9418365/209644392-22573090-e2c1-458b-ba44-855b79735632.png ">
<img width="1154" alt="image"
src="https://user-images.githubusercontent.com/9418365/209644457-a1b2711a-6787-45b4-b52c-a88d7fc132d7.png ">
Co-authored-by: delvh <dev.lh@web.de >
2022-12-29 14:40:20 +02:00
wxiaoguang
water
Jim Lin
Jason Song
