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
..
archiver	migrate from com.* to alternatives (#14103)	4 years ago
comments	Enhance Ghost comment mitigation Settings (#14392)	4 years ago
externalaccount	Allow externalID to be UUID (#8551)	5 years ago
gitdiff	Migrate to use jsoniter instead of encoding/json (#14841)	4 years ago
issue	label and milestone webhooks on issue/pull creation (#14363)	4 years ago
mailer	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	4 years ago
mirror	Create tag on ui (#13467)	4 years ago
pull	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
release	Create tag on ui (#13467)	4 years ago
repository	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	4 years ago
webhook	Migrate to use jsoniter instead of encoding/json (#14841)	4 years ago
wiki	migrate from com.* to alternatives (#14103)	4 years ago