0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-29 14:45:24 +01:00
gitea/services/pull
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>
2022-04-20 16:43:15 +02:00
..
check_test.go
check.go Don't allow merging PR's which are being conflict checked (#19357) 2022-04-20 16:43:15 +02:00
commit_status.go
lfs.go
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
merge.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
patch_unmerged.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
patch.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
pull_test.go
pull.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
review.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
temp_repo.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
update.go