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.
09adc26eb6
- Backport #19457 - 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. - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579 Co-authored-by: zeripath <art27@cantab.net> |
3 years ago | |
|---|---|---|
| .. | ||
| activitypub | 4 years ago | |
| analyze | 4 years ago | |
| appstate | 3 years ago | |
| auth | 3 years ago | |
| avatar | 3 years ago | |
| base | 3 years ago | |
| cache | 3 years ago | |
| charset | 3 years ago | |
| context | 3 years ago | |
| convert | 3 years ago | |
| csv | 3 years ago | |
| doctor | 3 years ago | |
| emoji | 4 years ago | |
| eventsource | 3 years ago | |
| generate | 3 years ago | |
| git | 3 years ago | |
| gitgraph | 3 years ago | |
| graceful | 3 years ago | |
| hcaptcha | 5 years ago | |
| highlight | 3 years ago | |
| hostmatcher | 3 years ago | |
| httpcache | 3 years ago | |
| httplib | 4 years ago | |
| indexer | 3 years ago | |
| json | 3 years ago | |
| lfs | 3 years ago | |
| log | 3 years ago | |
| markup | 3 years ago | |
| metrics | 3 years ago | |
| migration | 3 years ago | |
| nosql | 3 years ago | |
| notification | 3 years ago | |
| options | 3 years ago | |
| password | 4 years ago | |
| pprof | 4 years ago | |
| private | 3 years ago | |
| process | 3 years ago | |
| proxy | 4 years ago | |
| public | 3 years ago | |
| queue | 3 years ago | |
| recaptcha | 4 years ago | |
| references | 3 years ago | |
| repository | 3 years ago | |
| secret | 3 years ago | |
| session | 3 years ago | |
| setting | 3 years ago | |
| ssh | 3 years ago | |
| storage | 3 years ago | |
| structs | 3 years ago | |
| svg | 4 years ago | |
| sync | ||
| templates | 3 years ago | |
| test | 3 years ago | |
| timeutil | 3 years ago | |
| translation | 3 years ago | |
| typesniffer | 3 years ago | |
| updatechecker | 3 years ago | |
| upload | 3 years ago | |
| uri | 3 years ago | |
| user | 5 years ago | |
| util | 3 years ago | |
| validation | 3 years ago | |
| web | 3 years ago | |