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>		2021-03-03 22:41:23 -05:00
..
gitignore	Add make targed generate-license & generate-gitignore + Update (#12682)	2020-09-02 12:57:08 -04:00
label	Add label descriptions (#3662)	2018-03-13 10:03:55 +08:00
license	[skip ci] Updated licenses and gitignores	2021-02-28 00:43:14 +00:00
locale	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00