gitea/services/pull
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
..
check.go Don't allow merging PR's which are being conflict checked (#19357) (#19358) 2022-04-13 00:38:41 +08:00
check_test.go Decouple unit test, remove intermediate `unittestbridge` package (#17662) 2021-11-16 16:53:21 +08:00
commit_status.go Add missing `X-Total-Count` and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
lfs.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
merge.go Move checks for pulls before merge into own function (#19271) (#19277) 2022-03-31 16:57:13 +02:00
patch.go Set correct PR status on 3way on conflict checking (#19457) (#19458) 2022-04-22 09:11:42 +08:00
patch_unmerged.go Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 2021-12-19 05:19:25 +01:00
pull.go Restore propagation of ErrDependenciesLeft (#18325) 2022-01-19 00:26:42 +01:00
pull_test.go Append to existing trailers in generated squash commit message (#15980) 2021-06-25 13:01:43 -04:00
review.go Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
temp_repo.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
update.go Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00