1
0
Fork 0
forgejo/models
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
..
admin
appstate
asymkey
auth
avatars
db Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
fixtures GetFeeds must always discard actions with dangling repo_id (#19598) 2022-05-05 11:39:26 -04:00
foreignreference
issues
migrations Allow to mark files in a PR as viewed (#19007) 2022-05-07 20:28:10 +02:00
organization
packages
perm
project Add missing sorting column in project_issue table (#19635) 2022-05-06 22:25:59 +08:00
pull Allow to mark files in a PR as viewed (#19007) 2022-05-07 20:28:10 +02:00
repo Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2022-05-08 20:32:45 +08:00
unit
unittest GetFeeds must always discard actions with dangling repo_id (#19598) 2022-05-05 11:39:26 -04:00
user
webhook
access.go
access_test.go
action.go GetFeeds must always discard actions with dangling repo_id (#19598) 2022-05-05 11:39:26 -04:00
action_list.go GetFeeds must always discard actions with dangling repo_id (#19598) 2022-05-05 11:39:26 -04:00
action_test.go GetFeeds must always discard actions with dangling repo_id (#19598) 2022-05-05 11:39:26 -04:00
branches.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
branches_test.go
commit.go
commit_status.go
commit_status_test.go
consistency.go
consistency_test.go
engine_test.go
error.go
fixture_generation.go
fixture_test.go
helper.go
helper_directory.go
helper_environment.go
issue.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
issue_assignees.go
issue_assignees_test.go
issue_comment.go Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
issue_comment_list.go
issue_comment_test.go
issue_dependency.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
issue_dependency_test.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
issue_label.go
issue_label_test.go
issue_list.go
issue_list_test.go
issue_lock.go
issue_project.go
issue_stopwatch.go
issue_stopwatch_test.go
issue_test.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
issue_tracked_time.go
issue_tracked_time_test.go
issue_user.go
issue_user_test.go
issue_watch.go
issue_watch_test.go
issue_xref.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
issue_xref_test.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
lfs.go
lfs_lock.go
main_test.go
migrate.go
migrate_test.go
notification.go
notification_test.go
org.go
org_team.go
org_team_test.go
org_test.go
protected_tag.go
protected_tag_test.go
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
pull_list.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +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
release.go
repo.go Prevent NPE when checking repo units if the user is nil (#19625) 2022-05-06 11:54:22 +08:00
repo_activity.go
repo_collaboration.go
repo_collaboration_test.go
repo_generate.go
repo_generate_test.go
repo_list.go
repo_list_test.go
repo_permission.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
repo_permission_test.go
repo_test.go
repo_transfer.go
repo_transfer_test.go
review.go
review_test.go
statistic.go
task.go Only check for non-finished migrating task (#19601) 2022-05-04 12:09:42 +02:00
token.go
token_test.go
upload.go
user.go
user_heatmap.go
user_heatmap_test.go
user_test.go
userlist.go
userlist_test.go