Skip to content

fix ci #9958

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

Closed
wants to merge 4 commits into from
+1 −1
Closed

fix ci #9958

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf483b6
fix ci
lunny Jan 24, 2020
d3bd16b
Merge branch 'master' into lunny/fix_ci
zeripath Jan 24, 2020
a7bbaaa
Merge branch 'master' into lunny/fix_ci
lunny Jan 24, 2020
658bbb5
Merge branch 'master' into lunny/fix_ci
techknowlogick Jan 24, 2020
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: 1 addition & 1 deletion services/mailer/mail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, tos []string, fromMent

var mailBody bytes.Buffer

if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName), mailMeta); err != nil {
if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName+"-body"), mailMeta); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be necessary. bodyTemplates already contains templates for bodies only. This would generate names like "issue/new-body", which should not exist (and the function would leave mailBody empty).

It might be a little confusing that the log is written like:

log.Error("ExecuteTemplate [%s]: %v", string(tplName)+"/body", err)

Which suggest there is such thing as "issue/new/body", but in reality the name of the template is "issue/new" (or "issue/default") for both subject and body. The log says +"/body" only so the user knows which part of the template is failing.

log.Error("ExecuteTemplate [%s]: %v", string(tplName)+"/body", err)
}

Expand Down