forgejo/services
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
2022-04-21 22:55:45 +01:00
..
agit Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
asymkey Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
attachment Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
auth Remove dependent on session auth for api/v1 routers (#19321) 2022-04-08 06:22:10 +02:00
comments Move some issue methods as functions (#19255) 2022-03-29 16:57:33 +02:00
context Add ContextUser to http request context (#18798) 2022-03-26 17:04:22 +08:00
cron Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2022-04-03 17:46:48 +08:00
externalaccount Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
forms Move checks for pulls before merge into own function (#19271) 2022-03-31 16:53:08 +02:00
gitdiff Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
issue Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
lfs Update HTTP status codes to modern codes (#18063) 2022-03-23 12:54:07 +08:00
mailer Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
migrations Fix datarace in gitea_uploader.go (#19409) 2022-04-15 22:50:09 +08:00
mirror Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
org Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
packages Package registry changes (#19305) 2022-04-06 03:32:09 +02:00
pull Set correct PR status on 3way on conflict checking (#19457) 2022-04-21 22:55:45 +01:00
release Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
repository RepoAssignment ensure to close before overwrite (#19449) 2022-04-21 17:17:57 +02:00
task Use a more general (and faster) method to sanitize URLs with credentials (#19239) 2022-03-31 10:25:40 +08:00
user Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
webhook Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
wiki Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00