Giteabot a1bc2aa05e Avoid amending the Rebase and Fast-forward merge if there is no message template (#25779) (#25809) ...

Backport #25779 by @wxiaoguang

Related #22669. Close #25177

After the fix:


![image](https://github.com/go-gitea/gitea/assets/2114189/0e900927-ea72-4f8f-bde6-5ed927cb02f4)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

2023-07-10 10:23:54 +00:00

..

check_test.go

Improve queue and logger context (#24924)

2023-05-26 07:31:55 +00:00

check.go

Improve queue and logger context (#24924)

2023-05-26 07:31:55 +00:00

comment.go

Make more functions use ctx instead of db.DefaultContext (#24068)

2023-04-14 14:18:28 -04:00

commit_status.go

Support for status check pattern (#24633)

2023-05-17 16:11:13 +08:00

edits.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

lfs.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00

main_test.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

merge_merge.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00

merge_prepare.go

Refactor merge/update git command calls (#23366)

2023-03-09 09:48:52 -06:00

merge_rebase.go

Merge message template support for rebase without merge commit (#22669)

2023-05-22 09:01:46 +08:00

merge_squash.go

Improve squash merge commit author and co-author with private emails (#22977)

2023-03-09 22:17:04 -05:00

merge_test.go

Support template for merge message description (#22248)

2022-12-29 14:40:20 +02:00

merge.go

Avoid amending the Rebase and Fast-forward merge if there is no message template (#25779) (#25809)

2023-07-10 10:23:54 +00:00

patch_unmerged.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

patch.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00

pull_test.go

Support template for merge message description (#22248)

2022-12-29 14:40:20 +02:00

pull.go

Refresh the refernce of the closed PR when reopening (#24231)

2023-05-08 14:39:32 +08:00

review.go

Make more functions use ctx instead of db.DefaultContext (#24068)

2023-04-14 14:18:28 -04:00

temp_repo.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00

update_rebase.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00

update.go

Refactor and tidy-up the merge/update branch code (#22568)

2023-03-07 15:07:35 -05:00