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
..
activity.go	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00
attachment.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
blame.go	Refactor i18n, use Locale to provide i18n/translation related functions (#18648)	2022-02-08 11:02:30 +08:00
branch.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
cherry_pick.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
commit.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
compare.go	Handle the error of a missing blob object fix #19530 (#19552)	2022-05-02 18:46:50 +02:00
download.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
editor_test.go	Make git.OpenRepository accept Context (#19260)	2022-03-30 03:13:41 +08:00
editor.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
http_test.go	Fix http path bug (#16117)	2021-06-09 14:53:12 +02:00
http.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
issue_content_history.go	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	2022-04-03 17:46:48 +08:00
issue_dependency.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_label_test.go	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
issue_label.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
issue_lock.go	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
issue_stopwatch.go	Improve Stopwatch behavior (#18930)	2022-04-25 22:45:22 +02:00
issue_test.go	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
issue_timetrack.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
issue_watch.go	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
issue.go	Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)	2022-05-08 20:32:45 +08:00
lfs.go	Make git.OpenRepository accept Context (#19260)	2022-03-30 03:13:41 +08:00
main_test.go	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
middlewares.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
migrate.go	Use a more general (and faster) method to sanitize URLs with credentials (#19239)	2022-03-31 10:25:40 +08:00
milestone.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
packages.go	Hide private repositories in packages (#19584)	2022-05-07 18:21:15 +02:00
patch.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
projects_test.go	Decouple unit test code from business code (#17623)	2021-11-12 22:36:47 +08:00
projects.go	Move project files into models/project sub package (#17704)	2022-03-29 22:16:31 +08:00
pull_review.go	Allow to mark files in a PR as viewed (#19007)	2022-05-07 20:28:10 +02:00
pull.go	Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)	2022-05-08 20:32:45 +08:00
release_test.go	Decouple unit test, remove intermediate unittestbridge package (#17662)	2021-11-16 16:53:21 +08:00
release.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
repo.go	Improve dashboard's repo list performance (#18963)	2022-04-26 16:34:30 -04:00
search.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
setting_protected_branch.go	more context for models (#19511)	2022-04-28 13:48:48 +02:00
setting.go	When updating mirror repo intervals by API reschedule next update too (#19429)	2022-04-20 09:20:53 +01:00
settings_test.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
tag.go	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
topic.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
view.go	Add "Allow edits from maintainer" feature (#18002)	2022-04-28 17:45:33 +02:00
webhook.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00
wiki_test.go	Make git.OpenRepository accept Context (#19260)	2022-03-30 03:13:41 +08:00
wiki.go	Remove RequireHighlightJS field, update plantuml example. (#19615)	2022-05-05 10:53:38 +03:00