Jason Song 90982bffa5 Add force_merge to merge request and fix checking mergable (#23010) (#23032) ... Backport #23010. Fix #23000. The bug was introduced in #22633, and it seems that it has been noticed: https://github.com/go-gitea/gitea/pull/22633#discussion_r1095395359 . However, #22633 did nothing wrong, the logic should be "check if they is admin only when `force` is true". So we should provide the `ForceMerge` when merging from UI. After this, an admin can also send a normal merge request with `ForceMerge` false. So it fixes a potential bug: if the admin doesn't want to do a force merge, they just see the green "Merge" button and click it. At the same time, the status of the PR changed, and it shouldn't be merged now, so the admin could send an unexpected force merge. In addition, I updated `ForceMerge *bool` to `ForceMerge bool`, I don't see the reason to use a pointer. And fixed the logic of CheckPullMergable to handle auto merge and force merge correctly.		2023-02-21 09:42:22 -06:00
..
blob.go	RepoAssignment ensure to close before overwrite (#19449)	2022-04-21 17:17:57 +02:00
branch.go	Fix ListBranches to handle empty case (#21921) (#22024)	2022-12-04 17:13:11 -05:00
collaborators.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
commits.go	Add stat to ToCommit function for speed (#21337)	2022-10-06 11:21:04 +08:00
file.go	Add support for HEAD requests in Maven registry (#21834) (#21929)	2022-11-25 13:46:28 +02:00
fork.go	Move access and repo permission to models/perm/access (#19350)	2022-05-11 12:09:36 +02:00
git_hook.go	Move macaron to chi (#14293)	2021-01-26 16:36:53 +01:00
git_ref.go	Go 1.19 format (#20758)	2022-08-30 21:15:45 -05:00
hook.go	Decouple HookTask from Repository (#17940)	2022-10-21 18:21:56 +02:00
hook_test.go	Decouple HookTask from Repository (#17940)	2022-10-21 18:21:56 +02:00
issue.go	Use correct page size for link header pagination (#20546)	2022-08-02 22:59:44 +08:00
issue_comment.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
issue_label.go	Add more linters to improve code readability (#19989)	2022-06-20 12:02:49 +02:00
issue_reaction.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
issue_stopwatch.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
issue_subscription.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
issue_tracked_time.go	Go 1.19 format (#20758)	2022-08-30 21:15:45 -05:00
key.go	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)	2022-10-24 20:29:17 +01:00
label.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
language.go	Move almost all functions' parameter db.Engine to context.Context (#19748)	2022-05-20 22:08:52 +08:00
main_test.go	Use queue instead of memory queue in webhook send service (#19390)	2022-04-25 20:03:01 +02:00
migrate.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
milestone.go	fix: some typos (#19956)	2022-06-13 15:34:46 +08:00
mirror.go	Add sync_on_commit option for push mirrors api (#22271) (#22292)	2022-12-31 19:46:14 +08:00
notes.go	Add stat to ToCommit function for speed (#21337)	2022-10-06 11:21:04 +08:00
patch.go	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
pull.go	Add force_merge to merge request and fix checking mergable (#23010) (#23032)	2023-02-21 09:42:22 -06:00
pull_review.go	Dismiss prior pull reviews if done via web in review dismiss (#20197)	2022-07-19 15:20:28 +02:00
release.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
release_attachment.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
release_tags.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
repo.go	Make external issue tracker regexp configurable via API (#21338)	2022-10-07 20:49:30 +08:00
repo_test.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
star.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
status.go	Use complete SHA to create and query commit status (#22244) (#22257)	2022-12-28 11:03:21 +01:00
subscriber.go	Renamed ctx.User to ctx.Doer. (#19161)	2022-03-22 15:03:22 +08:00
tag.go	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)	2022-10-24 20:29:17 +01:00
teams.go	Move some files into models' sub packages (#20262)	2022-08-25 10:31:57 +08:00
topic.go	Add missing return for when topic isn't found (#20351)	2022-07-13 18:39:19 +01:00
transfer.go	Move almost all functions' parameter db.Engine to context.Context (#19748)	2022-05-20 22:08:52 +08:00
tree.go	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00
wiki.go	Webhook for Wiki changes (#20219)	2022-09-04 20:54:23 +01:00