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.
Gusted 5e68fe7d37
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>
2 years ago
..
check.go Don't allow merging PR's which are being conflict checked (#19357) 2 years ago
check_test.go Add Goroutine stack inspector to admin/monitor (#19207) 2 years ago
commit_status.go format with gofumpt (#18184) 2 years ago
lfs.go Propagate context and ensure git commands run in request context (#17868) 2 years ago
main_test.go Use a struct as test options (#19393) 2 years ago
merge.go Move milestone to models/issues/ (#19278) 2 years ago
patch.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
patch_unmerged.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
pull.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
pull_test.go Append to existing trailers in generated squash commit message (#15980) 3 years ago
review.go Move milestone to models/issues/ (#19278) 2 years ago
temp_repo.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
update.go Add config option to disable "Update branch by rebase" (#18745) 2 years ago