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.
* 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 |
2 years ago | |
---|---|---|
.. | ||
agit | 2 years ago | |
asymkey | 2 years ago | |
attachment | 2 years ago | |
auth | 2 years ago | |
comments | 2 years ago | |
context | 2 years ago | |
cron | 2 years ago | |
externalaccount | 3 years ago | |
forms | 2 years ago | |
gitdiff | 2 years ago | |
issue | 2 years ago | |
lfs | 2 years ago | |
mailer | 2 years ago | |
migrations | 2 years ago | |
mirror | 2 years ago | |
org | 2 years ago | |
packages | 2 years ago | |
pull | 2 years ago | |
release | 2 years ago | |
repository | 2 years ago | |
task | 2 years ago | |
user | 2 years ago | |
webhook | 2 years ago | |
wiki | 2 years ago |