0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-25 14:54:57 +01:00
gitea/services
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
..
agit more context for models (#19511) 2022-04-28 13:48:48 +02:00
asymkey Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
attachment Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
auth Move user password verification after checking his groups on ldap auth (#19587) 2022-05-03 20:41:11 +08:00
automerge Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2022-05-08 20:32:45 +08:00
comments Move some issue methods as functions (#19255) 2022-03-29 16:57:33 +02:00
context Add ContextUser to http request context (#18798) 2022-03-26 17:04:22 +08:00
cron Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2022-04-03 17:46:48 +08:00
externalaccount Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
forms Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2022-05-08 20:32:45 +08:00
gitdiff Allow to mark files in a PR as viewed (#19007) 2022-05-07 20:28:10 +02:00
issue Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
lfs more context for models (#19511) 2022-04-28 13:48:48 +02:00
mailer Added X-Mailer header to outgoing emails (#19562) 2022-04-30 15:40:55 +02:00
migrations ignore DNS error when doing migration allow/block check (#19566) 2022-05-02 12:02:17 +08:00
mirror Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
org Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
packages Package registry changes (#19305) 2022-04-06 03:32:09 +02:00
pull Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2022-05-08 20:32:45 +08:00
release Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
repository Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
task Use a more general (and faster) method to sanitize URLs with credentials (#19239) 2022-03-31 10:25:40 +08:00
user Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
webhook Use queue instead of memory queue in webhook send service (#19390) 2022-04-25 20:03:01 +02:00
wiki PullService lock via pullID (#19520) 2022-05-04 18:06:23 +02:00