Gusted 081449d7a5 Don't allow merging PR's which are being conflict checked (#19357) (#19358) ... * Don't allow merging PR's which are being conflict checked (#19357) - Backport of #19357 - 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). - Resolves #19352 * Update error message		2022-04-13 00:38:41 +08:00
..
check.go	Don't allow merging PR's which are being conflict checked (#19357) (#19358)	2022-04-13 00:38:41 +08:00
check_test.go
commit_status.go
lfs.go
main_test.go
merge.go	Move checks for pulls before merge into own function (#19271) (#19277)	2022-03-31 16:57:13 +02:00
patch.go	Detect conflicts with 3way merge (#18536) (#18537)	2022-02-02 14:35:25 +00:00
patch_unmerged.go
pull.go	Restore propagation of ErrDependenciesLeft (#18325)	2022-01-19 00:26:42 +01:00
pull_test.go
review.go	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
temp_repo.go
update.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00