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
..
check.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
check_test.go	migrate from com.* to alternatives (#14103)	4 years ago
commit_status.go	[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)	4 years ago
lfs.go	Add basic repository lfs management (#7199)	5 years ago
main_test.go	Move some pull request functions from models to services (#9266)	5 years ago
merge.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
patch.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
pull.go	Migrate to use jsoniter instead of encoding/json (#14841)	4 years ago
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	5 years ago
review.go	Fix a couple of CommentAsPatch issues. (#14804)	4 years ago
temp_repo.go	Handle more pathological branch and tag names (#11843)	5 years ago
update.go	Check Push permissions on IsUserAllowedToUpdate (#11448)	5 years ago