7 Commits

Author	SHA1	Message	Date
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
wxiaoguang	7b3ffe5745	Fix the Manually Merged form (#23015) (#23017) ... Backport #23015 --------- Co-authored-by: Jason Song <i@wolfogre.com>	2023-02-21 18:04:29 +08:00
Yarden Shoham	97f3f1988b	Fix typos in PullRequestMergeForm.vue header comment (#21378) ... Signed-off-by: Yarden Shoham <hrsi88@gmail.com>	2022-10-09 15:17:01 +08:00
wxiaoguang	2c2f75cb2c	Fix default merge style (#20564)	2022-07-31 17:13:31 +02:00
Ing. Jaroslav Šafka	8420c1bf4c	Fix checks in PR for empty commits #19603 (#20290) ... * Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id) * fill HeadCommitID in PullRequest * compare real commits ID as check for merging * based on @zeripath patch in #19738	2022-07-13 16:22:51 +08:00
6543	a9cc9c0f7a	Auto merge pull requests when all checks succeeded via WebUI (#19648) ... Add WebUI part of Auto merge feature close #19621 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: delvh <dev.lh@web.de>	2022-06-11 16:44:20 +02:00
wxiaoguang	368baf9e77	Use Vue to refactor pull merge UI (#19650) ... * Use Vue to refactor pull merge UI * add comments * fix comments * small fine tune * fix tests * adopt new pull default messages * clean up Co-authored-by: 6543 <6543@obermui.de>	2022-05-12 21:39:02 +08:00