6 commits

Author	SHA1	Message	Date
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