diff options
Diffstat (limited to 'routers/web')
| -rw-r--r-- | routers/web/repo/cherry_pick.go | 5 | ||||
| -rw-r--r-- | routers/web/repo/issue_dependency.go | 5 | ||||
| -rw-r--r-- | routers/web/repo/patch.go | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/routers/web/repo/cherry_pick.go b/routers/web/repo/cherry_pick.go index 5017d02252..25dd881219 100644 --- a/routers/web/repo/cherry_pick.go +++ b/routers/web/repo/cherry_pick.go @@ -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 } } diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 781c166713..022ec3ae3e 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -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 } } diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index 5faf9f4fa9..c04435cf1b 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -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) { |