Gusted ebe569a268 Set correct PR status on 3way on conflict checking (#19457) ... * Set correct PR status on 3way on conflict checking - 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. * Fix linter		2022-04-21 22:55:45 +01:00
..
convert.go
git_commit.go
git_commit_test.go
issue.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
issue_comment.go
issue_test.go	Move milestone to models/issues/ (#19278)	2022-04-08 17:11:15 +08:00
main_test.go	Use a struct as test options (#19393)	2022-04-14 21:58:21 +08:00
notification.go
package.go	Add Package Registry (#16510)	2022-03-30 16:42:47 +08:00
pull.go	Set correct PR status on 3way on conflict checking (#19457)	2022-04-21 22:55:45 +01:00
pull_review.go
pull_test.go
release.go
repository.go
status.go
user.go
user_test.go
utils.go
utils_test.go
wiki.go