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>

2020-02-27 15:37:11 +02: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

check.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

Prevent nil pointer in GetPullRequestCommitStatusState (#10342) (#10344)

2020-02-18 20:04:10 +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 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_test.go

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

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

pull.go

Prevent panic on merge to PR (#10403) (#10408)

2020-02-21 22:53:32 +00: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