gitea/services/pull
zeripath 431e482e3f
Reset the conflicted files list in testpatch (#18139)
Although #18004 will seriously reduce the likelihood of finding
conflicts in the first place - one bug was introduced whereby the
conflicted files status was not being reset properly. This leads to
conflicted PRs remaining conflicted when the conflict has been resolved.

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-12-31 20:33:55 +08:00
..
check.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +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 Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
patch.go Reset the conflicted files list in testpatch (#18139) 2021-12-31 20:33:55 +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 Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) 2021-12-16 19:01:14 +00: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