0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-01-23 02:46:27 +01:00
gitea/routers/web/repo
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
attachment.go
blame.go
branch.go
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
download.go
editor_test.go
editor.go Remove RequireHighlightJS field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00
http_test.go
http.go
issue_content_history.go
issue_dependency.go
issue_label_test.go
issue_label.go
issue_lock.go
issue_stopwatch.go
issue_test.go
issue_timetrack.go
issue_watch.go
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
main_test.go
middlewares.go
migrate.go
milestone.go
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
projects.go
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
release.go
repo.go
search.go Remove RequireHighlightJS field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00
setting_protected_branch.go
setting.go
settings_test.go
tag.go
topic.go
view.go
webhook.go Remove RequireHighlightJS field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00
wiki_test.go
wiki.go Remove RequireHighlightJS field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00