gitea/services
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
..
agit Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
asymkey Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
attachment Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
auth Remove dependent on session auth for api/v1 routers (#19321) 2022-04-08 06:22:10 +02:00
comments
context
cron Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2022-04-03 17:46:48 +08:00
externalaccount
forms Move checks for pulls before merge into own function (#19271) 2022-03-31 16:53:08 +02:00
gitdiff Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
issue Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
lfs
mailer Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
migrations Fix datarace in gitea_uploader.go (#19409) 2022-04-15 22:50:09 +08:00
mirror Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
org Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
packages Package registry changes (#19305) 2022-04-06 03:32:09 +02:00
pull Don't allow merging PR's which are being conflict checked (#19357) 2022-04-20 16:43:15 +02:00
release Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
repository Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
task Use a more general (and faster) method to sanitize URLs with credentials (#19239) 2022-03-31 10:25:40 +08:00
user Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
webhook Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
wiki Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00