You cannot 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 0dfe5fa2d6 Detect conflicts with 3way merge (#18536) (#18537) ... Backport #18536 Unforunately git apply --3way reports conflicts differently than standard patches resulting in conflicts being missed. Adjust the conflict detection code to account for this different error reporting. Fix #18514 Signed-off-by: Andrew Thornton <art27@cantab.net>		3 years ago
..
agit	Fix various typos (#18219)	3 years ago
asymkey	Refactor auth package (#17962)	3 years ago
attachment	Simplify parameter types (#18006)	3 years ago
auth	Use `ImagedProvider` for gplus oauth2 provider (#18504) (#18505)	3 years ago
comments	Move repository model into models/repo (#17933)	3 years ago
cron	Some repository refactors (#17950)	3 years ago
externalaccount	Refactor auth package (#17962)	3 years ago
forms	Support webauthn (#17957)	3 years ago
gitdiff	Fix various typos (#18219)	3 years ago
issue	Restore propagation of ErrDependenciesLeft (#18325)	3 years ago
lfs	Support webauthn (#17957)	3 years ago
mailer	Add option to convert CRLF to LF line endings for sendmail (#18075)	3 years ago
migrations	GitLab reviews may not have the updated_at field set (#18450) (#18461)	3 years ago
mirror	Some repository refactors (#17950)	3 years ago
org	Move repository model into models/repo (#17933)	3 years ago
pull	Detect conflicts with 3way merge (#18536) (#18537)	3 years ago
release	Set HeadCommit when creating tags. (#18116)	3 years ago
repository	Stop trimming preceding and suffixing spaces from editor filenames (#18334)	3 years ago
task	Some repository refactors (#17950)	3 years ago
user	Move keys to models/asymkey (#17917)	3 years ago
webhook	Add replay of webhooks. (#18191)	3 years ago
wiki	Fix various typos (#18219)	3 years ago