diff options
| author | Gusted <williamzijl7@hotmail.com> | 2022-04-20 14:43:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-20 16:43:15 +0200 |
| commit | 5e68fe7d37561aa9df470e4980cff833a7ee4f5f (patch) | |
| tree | 1fb4ee815b16f6c06243c7cf052f854be65d94ee /modules | |
| parent | f2229e0566478f8a2d8b968777f8ff356f1d4900 (diff) | |
| download | gitea-5e68fe7d37561aa9df470e4980cff833a7ee4f5f.tar.gz gitea-5e68fe7d37561aa9df470e4980cff833a7ee4f5f.zip | |
Don't allow merging PR's which are being conflict checked (#19357)
* Don't allow merging PR's which are being conflict checked
- When a PR is still being conflict checked, don't allow the PR to be
merged(the merge button could already be visible before e.g. a new
commit was pushed to the PR).
- Relevant(should prevent such issue from happening) #19352
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'modules')
0 files changed, 0 insertions, 0 deletions