Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix init mail render logic #20704

Merged
merged 6 commits into from
Aug 8, 2022
Merged

Fix init mail render logic #20704

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a86ac4
Moved InitMailRender.
KN4CK3R Aug 7, 2022
c0de7df
Merge branch 'main' into fix-mail-template
wxiaoguang Aug 8, 2022
f52b75a
Init mail templates in NewContext.
KN4CK3R Aug 8, 2022
20e7b1e
Merge branch 'fix-mail-template' of https://github.com/KN4CK3R/gitea …
KN4CK3R Aug 8, 2022
604c0ef
Fix tests.
KN4CK3R Aug 8, 2022
79e291e
Merge branch 'main' into fix-mail-template
6543 Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions routers/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"code.gitea.io/gitea/modules/ssh"
"code.gitea.io/gitea/modules/storage"
"code.gitea.io/gitea/modules/svg"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
Expand Down Expand Up @@ -118,6 +119,7 @@ func GlobalInitInstalled(ctx context.Context) {
mustInit(storage.Init)

mailer.NewContext()
mailer.InitMailRender(templates.Mailer())
lunny marked this conversation as resolved.
Show resolved Hide resolved
mustInit(cache.NewContext)
notification.NewContext()
mustInit(archiver.Init)
Expand Down
4 changes: 0 additions & 4 deletions routers/web/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/validation"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/modules/web/routing"
Expand All @@ -43,7 +42,6 @@ import (
context_service "code.gitea.io/gitea/services/context"
"code.gitea.io/gitea/services/forms"
"code.gitea.io/gitea/services/lfs"
"code.gitea.io/gitea/services/mailer"

_ "code.gitea.io/gitea/modules/session" // to registers all internal adapters

Expand Down Expand Up @@ -152,8 +150,6 @@ func Routes() *web.Route {
common = append(common, h)
}

mailer.InitMailRender(templates.Mailer())

if setting.Service.EnableCaptcha {
// The captcha http.Handler should only fire on /captcha/* so we can just mount this on that url
routes.Route("/captcha/*", "GET,HEAD", append(common, captcha.Captchaer(context.GetImageCaptcha()))...)
Expand Down