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

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)

2020-02-22 15:08:48 +02:00

patch.go

Add require signed commit for protected branch (#9708)

2020-01-15 09:32:57 +01: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)

2020-02-21 18:18:13 +00:00

review.go

Some refactor on git diff and ignore getting commit information failed on migrating pull request review comments (#9996)

2020-01-28 08:02:03 +00:00

temp_repo.go

Remove SavePatch and generate patches on the fly (#9302)

2019-12-13 23:21:06 +01:00

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