This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.

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>		2022-04-22 09:11:42 +08:00
..
convert.go	Team permission allow different unit has different permission (#17811)	2022-01-05 11:37:00 +08:00
git_commit.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
git_commit_test.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
issue.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
issue_comment.go	Add API to get issue/pull comments and events (timeline) (#17403)	2022-01-01 22:12:25 +08:00
issue_test.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
main_test.go
notification.go
pull.go	Set correct PR status on 3way on conflict checking (#19457) (#19458)	2022-04-22 09:11:42 +08:00
pull_review.go
pull_test.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
release.go
repository.go	Add MirrorUpdated field to Repository API type (#18267)	2022-01-18 13:18:30 +00:00
status.go
user.go
user_test.go
utils.go
utils_test.go
wiki.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00