This repository has been archived on 2023-02-01. You can view files and clone it, but cannot push or open issues or pull requests.
gitea/services/pull
zeripath bfce841b04
Only update merge_base if not already merged (#10909)
* Only update merge_base if not already merged

Fix #10766

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Prevent race in transfer pull request

* Update services/pull/pull.go
2020-04-01 15:33:44 +03:00
..
check.go Only update merge_base if not already merged (#10909) 2020-04-01 15:33:44 +03:00
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 2020-02-10 13:09:08 +00:00
commit_status.go Fix bug on pull view when required status check no ci result (#10648) (#10651) 2020-03-07 17:32:08 +08: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 message in Merge & Web Editor (#10373) (#10497) 2020-02-27 15:37:11 +02:00
patch.go Remove stray printf (#9631) 2020-01-07 14:30:03 +00:00
pull.go Only update merge_base if not already merged (#10909) 2020-04-01 15:33:44 +03:00
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 2019-12-15 04:28:51 +01:00
review.go remove unused method and rename createcommentWithNoAction (#9367) 2019-12-16 11:54:24 +08:00
temp_repo.go Remove SavePatch and generate patches on the fly (#9302) 2019-12-13 23:21:06 +01:00