You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
4 years ago
..
check.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 4 years ago
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 4 years ago
commit_status.go Prevent nil pointer in GetPullRequestCommitStatusState (#10342) 4 years ago
lfs.go Add basic repository lfs management (#7199) 5 years ago
main_test.go Move some pull request functions from models to services (#9266) 5 years ago
merge.go Handle push rejection message in Merge & Web Editor (#10373) 4 years ago
patch.go Add require signed commit for protected branch (#9708) 5 years ago
pull.go Prevent panic on merge to PR (#10403) 4 years ago
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 5 years ago
review.go Some refactor on git diff and ignore getting commit information failed on migrating pull request review comments (#9996) 4 years ago
temp_repo.go Remove SavePatch and generate patches on the fly (#9302) 5 years ago
update.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 4 years ago