mirror of
https://github.com/go-gitea/gitea.git
synced 2025-01-13 00:12:31 +00:00
fix: agit prompt to create pull request
template error for block user alert
This commit is contained in:
parent
7d3673a127
commit
32a320d4d6
@ -705,7 +705,8 @@ Gitea or set your environment appropriately.`, "")
|
||||
|
||||
if err == nil {
|
||||
for _, res := range resp.Results {
|
||||
hookPrintResult(res.ShouldShowMessage, res.IsCreatePR, res.HeadBranch, res.URL)
|
||||
// AGit always creates a pull request so there is no point is prompting user to create one
|
||||
hookPrintResult(res.ShouldShowMessage, false, res.HeadBranch, res.URL)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1356,6 +1356,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
|
||||
flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
|
||||
"Message": ctx.Tr("repo.pulls.push_rejected"),
|
||||
"Summary": ctx.Tr("repo.pulls.new.blocked_user"),
|
||||
"Details": "",
|
||||
})
|
||||
if err != nil {
|
||||
ctx.ServerError("CompareAndPullRequest.HTMLString", err)
|
||||
@ -1366,6 +1367,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
|
||||
flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
|
||||
"Message": ctx.Tr("repo.pulls.push_rejected"),
|
||||
"Summary": ctx.Tr("repo.pulls.new.must_collaborator"),
|
||||
"Details": "",
|
||||
})
|
||||
if err != nil {
|
||||
ctx.ServerError("CompareAndPullRequest.HTMLString", err)
|
||||
|
Loading…
Reference in New Issue
Block a user