gitea/services/pull
guillep2k 7284327a00
Prevent panic on merge to PR (#10403) (#10408)
If you attempt to merge to a branch which on a PR there will be a nil pointer error in the pull request checker.

This panic is uncaught and will bring down the gitea server.

This PR adds protection to prevent this.

Co-authored-by: zeripath <art27@cantab.net>
2020-02-21 22:53:32 +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
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
commit_status.go Prevent nil pointer in GetPullRequestCommitStatusState (#10342) (#10344) 2020-02-18 20:04:10 +00:00
lfs.go
main_test.go
merge.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
patch.go
pull.go Prevent panic on merge to PR (#10403) (#10408) 2020-02-21 22:53:32 +00:00
pull_test.go
review.go
temp_repo.go