mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-01-09 17:14:33 +00:00
d5fec46de7
Fix #31625.
If `pull_service.NewPullRequest` return an error which misses each `if`
check, `CompareAndPullRequestPost` will return immediately, since it
doesn't write the HTTP response, a 200 response with empty body will be
sent to clients.
```go
if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
} else if git.IsErrPushRejected(err) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, user_model.ErrBlockedUser) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, issues_model.ErrMustCollaborator) {
// ...
ctx.JSONError(flashError)
}
return
}
```
Not sure what kind of error can cause it to happen, so this PR just
expose it. And we can fix it when users report that creating PRs failed
with error responses.
It's all my guess since I cannot reproduce the problem, but even if it's
not related, the code here needs to be improved.
(cherry picked from commit acd7053e9d4968e8b9812ab379be9027ac8e7771)
Conflicts:
routers/web/repo/pull.go
trivial context conflict
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| actions | ||
| badges | ||
| flags | ||
| setting | ||
| activity.go | ||
| attachment.go | ||
| blame.go | ||
| branch.go | ||
| cherry_pick.go | ||
| code_frequency.go | ||
| commit.go | ||
| compare.go | ||
| contributors.go | ||
| download.go | ||
| editor.go | ||
| editor_test.go | ||
| find.go | ||
| githttp.go | ||
| githttp_test.go | ||
| helper.go | ||
| helper_test.go | ||
| issue.go | ||
| issue_content_history.go | ||
| issue_dependency.go | ||
| issue_label.go | ||
| issue_label_test.go | ||
| issue_lock.go | ||
| issue_pin.go | ||
| issue_stopwatch.go | ||
| issue_test.go | ||
| issue_timetrack.go | ||
| issue_watch.go | ||
| main_test.go | ||
| middlewares.go | ||
| migrate.go | ||
| milestone.go | ||
| packages.go | ||
| patch.go | ||
| projects.go | ||
| projects_test.go | ||
| pull.go | ||
| pull_review.go | ||
| pull_review_test.go | ||
| recent_commits.go | ||
| release.go | ||
| release_test.go | ||
| render.go | ||
| repo.go | ||
| search.go | ||
| topic.go | ||
| treelist.go | ||
| view.go | ||
| view_test.go | ||
| wiki.go | ||
| wiki_test.go | ||