mirror of https://github.com/go-gitea/gitea.git
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.
ebe569a268
* 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 | 3 years ago | |
| asymkey | 3 years ago | |
| attachment | 3 years ago | |
| auth | 3 years ago | |
| comments | 3 years ago | |
| context | 3 years ago | |
| cron | 3 years ago | |
| externalaccount | 3 years ago | |
| forms | 3 years ago | |
| gitdiff | 3 years ago | |
| issue | 3 years ago | |
| lfs | 3 years ago | |
| mailer | 3 years ago | |
| migrations | 3 years ago | |
| mirror | 3 years ago | |
| org | 3 years ago | |
| packages | 3 years ago | |
| pull | 3 years ago | |
| release | 3 years ago | |
| repository | 3 years ago | |
| task | 3 years ago | |
| user | 3 years ago | |
| webhook | 3 years ago | |
| wiki | 3 years ago | |