4 people 408bc2c8b5 Only update merge_base in checker if not already merged (#10908) ...

Fix #10766

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lauris BH <[email protected]>

2020-04-01 15:02:11 +03:00

..

check_test.go

Only check for conflicts/merging if the PR has not been merged in the interim (#10132)

2020-02-10 01:09:31 +02:00

check.go

Only update merge_base in checker if not already merged (#10908)

2020-04-01 15:02:11 +03:00

commit_status.go

Fix bug on pull view when required status check no ci result (#10648)

2020-03-07 07:33:20 +00:00

lfs.go

Add basic repository lfs management (#7199)

2019-10-28 18:31:55 +00:00

main_test.go

Move some pull request functions from models to services (#9266)

2019-12-06 21:44:10 -05:00

merge.go

Handle push rejection in branch and upload (#10854)

2020-03-28 01:13:18 -03:00

patch.go

Remove Unused Functions (#10516)

2020-03-02 00:05:44 +02:00

pull_test.go

Move PushToBaseRepo from models to services/pull (#9352)

2019-12-15 04:28:51 +01:00

pull.go

Only update merge_base in checker if not already merged (#10908)

2020-04-01 15:02:11 +03:00

review.go

Display pull request head branch even the branch deleted or repository deleted (#10413)

2020-03-02 22:31:55 +00:00

temp_repo.go

Display pull request head branch even the branch deleted or repository deleted (#10413)

2020-03-02 22:31:55 +00:00

update.go

Only check for conflicts/merging if the PR has not been merged in the interim (#10132)

2020-02-10 01:09:31 +02:00