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.
gitea/services/pull
zeripath 5d11ccc9e1
Handle push rejection message in Merge & Web Editor (#10373) (#10497)
Backport #10373

* Handle push rejection message in Merge

* Fix sanitize, adjust message handling

* Handle push-rejection in webeditor CRUD too

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
5 years ago
..
check.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 5 years ago
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 5 years ago
commit_status.go Prevent nil pointer in GetPullRequestCommitStatusState (#10342) (#10344) 5 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) (#10497) 5 years ago
patch.go Remove stray printf (#9631) 5 years ago
pull.go Prevent panic on merge to PR (#10403) (#10408) 5 years ago
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 5 years ago
review.go remove unused method and rename createcommentWithNoAction (#9367) 5 years ago
temp_repo.go Remove SavePatch and generate patches on the fly (#9302) 5 years ago