You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

zeripath 1eebbf23f0 When conflicts have been previously detected ensure that they can be resolved (#19247) ... There is yet another problem with conflicted files not being reset when the test patch resolves them. This PR adjusts the code for checkConflicts to reset the ConflictedFiles field immediately at the top. It also adds a reset to conflictedFiles for the manuallyMerged and a shortcut for the empty status in protectedfiles. Signed-off-by: Andrew Thornton <art27@cantab.net>		3 years ago
..
agit	Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)	3 years ago
asymkey	Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)	3 years ago
attachment	Simplify parameter types (#18006)	3 years ago
auth	Move organization related structs into sub package (#18518)	3 years ago
comments	Move some issue methods as functions (#19255)	3 years ago
context	Add `ContextUser` to http request context (#18798)	3 years ago
cron	Show last cron messages on monitor page (#19223)	3 years ago
externalaccount	Refactor auth package (#17962)	3 years ago
forms	Move project files into models/project sub package (#17704)	3 years ago
gitdiff	rm .sample hooks which aren't used (#19101)	3 years ago
issue	Move some issue methods as functions (#19255)	3 years ago
lfs	Update HTTP status codes to modern codes (#18063)	3 years ago
mailer	Move organization related structs into sub package (#18518)	3 years ago
migrations	Update HTTP status codes to modern codes (#18063)	3 years ago
mirror	Touch mirrors on even on fail to update (#19217)	3 years ago
org	Move organization related structs into sub package (#18518)	3 years ago
pull	When conflicts have been previously detected ensure that they can be resolved (#19247)	3 years ago
release	Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)	3 years ago
repository	Move init repository related functions to modules (#19159)	3 years ago
task	Pause queues (#15928)	3 years ago
user	Move organization related structs into sub package (#18518)	3 years ago
webhook	Only send webhook events to active system webhooks and only deliver to active hooks (#19234)	3 years ago
wiki	Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)	3 years ago