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.

Gusted ebe569a268 Set correct PR status on 3way on conflict checking (#19457) ... * Set correct PR status on 3way on conflict checking - 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. * Fix linter		3 years ago
..
agit	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	3 years ago
asymkey	Use a struct as test options (#19393)	3 years ago
attachment	Use a struct as test options (#19393)	3 years ago
auth	Remove dependent on session auth for api/v1 routers (#19321)	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	Remove legacy unmaintained packages, refactor to support change default locale (#19308)	3 years ago
externalaccount	Refactor auth package (#17962)	3 years ago
forms	Move checks for pulls before merge into own function (#19271)	3 years ago
gitdiff	Use a struct as test options (#19393)	3 years ago
issue	Use a struct as test options (#19393)	3 years ago
lfs	Update HTTP status codes to modern codes (#18063)	3 years ago
mailer	Use a struct as test options (#19393)	3 years ago
migrations	Fix datarace in gitea_uploader.go (#19409)	3 years ago
mirror	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	3 years ago
org	Use a struct as test options (#19393)	3 years ago
packages	Package registry changes (#19305)	3 years ago
pull	Set correct PR status on 3way on conflict checking (#19457)	3 years ago
release	Use a struct as test options (#19393)	3 years ago
repository	RepoAssignment ensure to close before overwrite (#19449)	3 years ago
task	Use a more general (and faster) method to sanitize URLs with credentials (#19239)	3 years ago
user	Use a struct as test options (#19393)	3 years ago
webhook	Use a struct as test options (#19393)	3 years ago
wiki	Use a struct as test options (#19393)	3 years ago