finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki 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

3
routers/api/v1/repo/pull.go
View file

@ -625,9 +625,8 @@ func EditPullRequest(ctx *context.APIContext) {
} else if models.IsErrPullRequestHasMerged(err) {
ctx.Error(http.StatusConflict, "IsErrPullRequestHasMerged", err)
return
} else {
ctx.InternalServerError(err)
}
ctx.InternalServerError(err)
return
}
notify_service.PullRequestChangeTargetBranch(ctx, ctx.Doer, pr, form.Base)

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
}
}

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

@ -80,10 +80,9 @@ func AddDependency(ctx *context.Context) {
} else if issues_model.IsErrCircularDependency(err) {
ctx.Flash.Error(ctx.Tr("repo.issues.dependency.add_error_cannot_create_circular"))
return
} else {
ctx.ServerError("CreateOrUpdateIssueDependency", err)
return
}
ctx.ServerError("CreateOrUpdateIssueDependency", err)
return
}
}

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

@ -104,10 +104,9 @@ func NewDiffPatchPost(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
}
if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) {