Skip to content

Commit b7d696d

Browse files
committed
fix template arguments
1 parent a92bfb9 commit b7d696d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

routers/web/repo/pull.go

+2
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
13561356
flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
13571357
"Message": ctx.Tr("repo.pulls.push_rejected"),
13581358
"Summary": ctx.Tr("repo.pulls.new.blocked_user"),
1359+
"Details": "",
13591360
})
13601361
if err != nil {
13611362
ctx.ServerError("CompareAndPullRequest.HTMLString", err)
@@ -1366,6 +1367,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
13661367
flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
13671368
"Message": ctx.Tr("repo.pulls.push_rejected"),
13681369
"Summary": ctx.Tr("repo.pulls.new.must_collaborator"),
1370+
"Details": "",
13691371
})
13701372
if err != nil {
13711373
ctx.ServerError("CompareAndPullRequest.HTMLString", err)

tests/integration/pull_create_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func testPullCreateFailure(t *testing.T, session *TestSession, baseRepoOwner, ba
104104
"_csrf": htmlDoc.GetCSRF(),
105105
"title": title,
106106
})
107-
resp = session.MakeRequest(t, req, http.StatusInternalServerError)
107+
resp = session.MakeRequest(t, req, http.StatusBadRequest)
108108
return resp
109109
}
110110

0 commit comments

Comments
 (0)