6543 123c254b84

Move checks for pulls before merge into own function (#19271) (#19277) ...

Backport #19271

Fix:
* The API does ignore issue dependencies where Web does not
* The API checks if "IsSignedIfRequired" where Web does not - UI probably do but nothing will some to craft custom requests
* Default merge message is crafted a bit different between API and Web if not set on specific cases ...

2022-03-31 16:57:13 +02:00

..

check_test.go

…

check.go

Move checks for pulls before merge into own function (#19271) (#19277)

2022-03-31 16:57:13 +02:00

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_unmerged.go

…

patch.go

Detect conflicts with 3way merge (#18536) (#18537)

2022-02-02 14:35:25 +00:00

pull_test.go

…

pull.go

Restore propagation of ErrDependenciesLeft (#18325)

2022-01-19 00:26:42 +01:00

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