You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

a1012112796 a5279b74b6 Make manual merge autodetection optional and add manual merge as merge method (#12543) ... * Make auto check manual merge as a chooseable mod and add manual merge way on ui as title, Before this pr, we use same way with GH to check manually merge. It good, but in some special cases, misjudgments can occur. and it's hard to fix this bug. So I add option to allow repo manager block "auto check manual merge" function, Then it will have same style like gitlab(allow empty pr). and to compensate for not being able to detect THE PR merge automatically, I added a manual approach. Signed-off-by: a1012112796 <1012112796@qq.com> * make swager * api support * ping ci * fix TestPullCreate_EmptyChangesWithCommits * Apply suggestions from code review Co-authored-by: zeripath <art27@cantab.net> * Apply review suggestions and add test * Apply suggestions from code review Co-authored-by: zeripath <art27@cantab.net> * fix build * test error message * make fmt * Fix indentation issues identified by @silverwind Co-authored-by: silverwind <me@silverwind.io> * Fix tests and make manually merged disabled error on API the same Signed-off-by: Andrew Thornton <art27@cantab.net> * a small nit * fix wrong commit id error * fix bug * simple test * fix test Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>		4 years ago
..
add_reaction.tmpl	Align dropdown right (#14406)	4 years ago
attachments.tmpl	add thumbnail preview section to issue attachments (#13826)	4 years ago
comments.tmpl	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
comments_delete_time.tmpl	Add UI to delete tracked times (#14100)	4 years ago
context_menu.tmpl	Don't show "Reference in new issue" when issues unit is globally disabled (#14437)	4 years ago
pull.tmpl	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
reactions.tmpl	Support unicode emojis and remove emojify.js (#11032)	5 years ago
reference_issue_dialog.tmpl	Comment - Reference in new issue (#14366)	4 years ago
sidebar.tmpl	Fix issue/pul sidebar (#14826)	4 years ago