diff options
| author | silverwind <me@silverwind.io> | 2024-04-22 13:48:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 11:48:42 +0000 |
| commit | 74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2 (patch) | |
| tree | 94b0356bea5ad1cd24a523947cf001509a973be1 /modules/templates | |
| parent | aff7b7bdd285cc1fcabea774f153886e11ae9f5d (diff) | |
| download | gitea-74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2.tar.gz gitea-74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2.zip | |
Enable more `revive` linter rules (#30608)
Noteable additions:
- `redefines-builtin-id` forbid variable names that shadow go builtins
- `empty-lines` remove unnecessary empty lines that `gofumpt` does not
remove for some reason
- `superfluous-else` eliminate more superfluous `else` branches
Rules are also sorted alphabetically and I cleaned up various parts of
`.golangci.yml`.
Diffstat (limited to 'modules/templates')
| -rw-r--r-- | modules/templates/htmlrenderer.go | 5 | ||||
| -rw-r--r-- | modules/templates/mailer.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go index 40941285aa..e7e805ed30 100644 --- a/modules/templates/htmlrenderer.go +++ b/modules/templates/htmlrenderer.go @@ -138,10 +138,9 @@ func wrapTmplErrMsg(msg string) { if setting.IsProd { // in prod mode, Gitea must have correct templates to run log.Fatal("Gitea can't run with template errors: %s", msg) - } else { - // in dev mode, do not need to really exit, because the template errors could be fixed by developer soon and the templates get reloaded - log.Error("There are template errors but Gitea continues to run in dev mode: %s", msg) } + // in dev mode, do not need to really exit, because the template errors could be fixed by developer soon and the templates get reloaded + log.Error("There are template errors but Gitea continues to run in dev mode: %s", msg) } type templateErrorPrettier struct { diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index f1832cba0e..7c97e1ea89 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -84,9 +84,8 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) { if err = buildSubjectBodyTemplate(subjectTemplates, bodyTemplates, tmplName, content); err != nil { if firstRun { log.Fatal("Failed to parse mail template, err: %v", err) - } else { - log.Error("Failed to parse mail template, err: %v", err) } + log.Error("Failed to parse mail template, err: %v", err) } } } |