domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Upgrade to golangci-lint@v1.55.0 (#27756)

Browse source 
https://github.com/golangci/golangci-lint/releases/tag/v1.55.0
This commit is contained in:
silverwind 2023-10-24 04:54:59 +02:00 • committed by GitHub
parent def907de7b
commit ce83609ff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 105 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

5
routers/web/repo/cherry_pick.go
View file

@ -171,10 +171,9 @@ func CherryPickPost(ctx *context.Context) {
} else if models.IsErrCommitIDDoesNotMatch(err) {
ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+form.LastCommit+"..."+ctx.Repo.CommitID), tplPatchFile, &form)
return
} else {
ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_apply_patch", err), tplPatchFile, &form)
return
}
ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_apply_patch", err), tplPatchFile, &form)
return
}
}