Lunny Xiao 4344a64107 Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) ... * Allow custom default merge message with .gitea/MERGE_MESSAGE_<merge_style>_TEMPLATE.md * Some improvements * Follow some advices * Fix bug * Fix bug * Fix lint * Fix close comment * Fix test * Fix and docs * Improve codes * Update docs and remove unnecessary variables * return error for GetDefaultMergeMessage * Fix test * improve code * ignore unknow unit type * return error for GetDefaultMergeMessage * Update services/pull/merge.go * Some improvements * Follow some advices * Fix bug * Fix lint * Improve codes * Update docs and remove unnecessary variables * return error for GetDefaultMergeMessage * improve code * Handle deleted HeadRepo in GetDefaultMergeMessage Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix test * Fix test Co-authored-by: zeripath <art27@cantab.net>		2022-05-08 20:32:45 +08:00
..
check_test.go	Dont overwrite err with nil & rename PullCheckingFuncs to reflect there usage (#19572)	2022-05-02 01:54:44 +02:00
check.go	PullService lock via pullID (#19520)	2022-05-04 18:06:23 +02:00
commit_status.go	Auto merge pull requests when all checks succeeded via API (#9307)	2022-05-08 01:05:52 +08:00
edits.go	Add "Allow edits from maintainer" feature (#18002)	2022-04-28 17:45:33 +02:00
lfs.go	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00
main_test.go	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
merge.go	Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)	2022-05-08 20:32:45 +08:00
patch_unmerged.go	Remove git.Command.Run and git.Command.RunInDir* (#19280)	2022-04-01 10:55:30 +08:00
patch.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
pull_test.go	Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)	2022-05-08 20:32:45 +08:00
pull.go	Auto merge pull requests when all checks succeeded via API (#9307)	2022-05-08 01:05:52 +08:00
review.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
temp_repo.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
update.go	PullService lock via pullID (#19520)	2022-05-04 18:06:23 +02:00