diff options
| author | Gusted <williamzijl7@hotmail.com> | 2022-04-21 21:55:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 22:55:45 +0100 |
| commit | ebe569a268bbe71bf2bc30cd2829227700688b57 (patch) | |
| tree | e4ba88d01dbaaee73135b8f61f52ae78487c0383 /modules/public | |
| parent | 3ec1b6c2238c9eb46709091567eb2564aec86d99 (diff) | |
| download | gitea-ebe569a268bbe71bf2bc30cd2829227700688b57.tar.gz gitea-ebe569a268bbe71bf2bc30cd2829227700688b57.zip | |
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
Diffstat (limited to 'modules/public')
0 files changed, 0 insertions, 0 deletions