zeripath 089ccb0c80 Handle push rejection message in Merge & Web Editor (#10373) ... * Handle push rejection message in Merge * placate golangci-lint * Fix sanitize, adjust message handling * oops * Oops * Handle push-rejection in webeditor CRUD too * Apply suggestions from code review Co-authored-by: Lauris BH <lauris@nix.lv>		2020-02-22 15:08:48 +02: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 check for conflicts/merging if the PR has not been merged in the interim (#10132)	2020-02-10 01:09:31 +02:00
commit_status.go	Prevent nil pointer in GetPullRequestCommitStatusState (#10342)	2020-02-18 19:34:08 +00:00
lfs.go
main_test.go
merge.go	Handle push rejection message in Merge & Web Editor (#10373)	2020-02-22 15:08:48 +02:00
patch.go
pull_test.go
pull.go	Prevent panic on merge to PR (#10403)	2020-02-21 18:18:13 +00:00
review.go
temp_repo.go
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