gitea/modules/convert
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 Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
notification.go Move accessmode into models/perm (#17828) 2021-11-28 12:58:28 +01:00
pull.go Set correct PR status on 3way on conflict checking (#19457) (#19458) 2022-04-22 09:11:42 +08:00
pull_review.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
pull_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
release.go Move attachment into models/repo/ (#17650) 2021-11-19 21:39:57 +08:00
repository.go Add MirrorUpdated field to Repository API type (#18267) 2022-01-18 13:18:30 +00:00
status.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
user.go Move accessmode into models/perm (#17828) 2021-11-28 12:58:28 +01:00
user_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
utils.go Add migration from GitBucket (#16767) 2021-11-14 20:11:10 +01:00
utils_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
wiki.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00