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
..
agit	Move user related model into models/user (#17781)	2021-11-24 17:49:20 +08:00
asymkey	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
attachment	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
auth	Reset Session ID on login (#18018)	2021-12-20 22:12:26 +08:00
comments	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
cron	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
externalaccount	Refactor HTTP request context (#17979)	2021-12-15 14:59:57 +08:00
forms	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
gitdiff	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
issue	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
lfs	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
mailer	Add List-Unsubscribe header (#17804)	2021-12-21 22:53:03 +00:00
migrations	Do not read or write git reference files directly (#18079)	2021-12-23 21:44:00 +08:00
mirror	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
org	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
pull	Reset the conflicted files list in testpatch (#18139)	2021-12-31 20:33:55 +08:00
release	Set HeadCommit when creating tags. (#18116)	2021-12-29 19:40:57 +08:00
repository	Set HeadCommit when creating tags. (#18116)	2021-12-29 19:40:57 +08:00
task	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
user	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
webhook	Add issue hyperlinks in the webhook of wechatwork (#18102)	2021-12-25 21:30:09 +08:00
wiki	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00