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

Gusted 09adc26eb6 Set correct PR status on 3way on conflict checking (#19457) (#19458) ... - Backport #19457 - When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's. - Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable. - Add a dedicated test for conflicting checking, so it should prevent future issues with this. - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579 Co-authored-by: zeripath <art27@cantab.net>		3 years ago
..
convert.go	Team permission allow different unit has different permission (#17811)	3 years ago
git_commit.go	Move repository model into models/repo (#17933)	3 years ago
git_commit_test.go	Move repository model into models/repo (#17933)	3 years ago
issue.go	Move repository model into models/repo (#17933)	3 years ago
issue_comment.go	Add API to get issue/pull comments and events (timeline) (#17403)	3 years ago
issue_test.go	Move repository model into models/repo (#17933)	3 years ago
main_test.go	Decouple unit test code from business code (#17623)	3 years ago
notification.go	Move accessmode into models/perm (#17828)	3 years ago
pull.go	Set correct PR status on 3way on conflict checking (#19457) (#19458)	3 years ago
pull_review.go	Move user related model into models/user (#17781)	3 years ago
pull_test.go	Move repository model into models/repo (#17933)	3 years ago
release.go	Move attachment into models/repo/ (#17650)	3 years ago
repository.go	Add MirrorUpdated field to Repository API type (#18267)	3 years ago
status.go	Move user related model into models/user (#17781)	3 years ago
user.go	Move accessmode into models/perm (#17828)	3 years ago
user_test.go	Move user related model into models/user (#17781)	3 years ago
utils.go	Add migration from GitBucket (#16767)	3 years ago
utils_test.go	A better go code formatter, and now `make fmt` can run in Windows (#17684)	3 years ago
wiki.go	Move repository model into models/repo (#17933)	3 years ago