diff options
| author | Unknwon <u@gogs.io> | 2016-08-16 10:19:09 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-16 10:19:09 -0700 |
| commit | 6f9a95f83020e215ebe3942bd541da34791dd043 (patch) | |
| tree | 9d95bc94e2346c808863377f79708d32decb8908 /models/mail.go | |
| parent | 8bf57be9ba82d7b5289c894c902b5ecaaa1142bf (diff) | |
| download | gitea-6f9a95f83020e215ebe3942bd541da34791dd043.tar.gz gitea-6f9a95f83020e215ebe3942bd541da34791dd043.zip | |
#2246 add HTMLURL to webhook type
- Fill Milestone and Assignee field when available in webhook payload
Diffstat (limited to 'models/mail.go')
| -rw-r--r-- | models/mail.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/mail.go b/models/mail.go index 8e7f4bba40..0db21355a8 100644 --- a/models/mail.go +++ b/models/mail.go @@ -129,7 +129,7 @@ func SendCollaboratorMail(u, doer *User, repo *Repository) { data := map[string]interface{}{ "Subject": subject, "RepoName": repoName, - "Link": repo.FullLink(), + "Link": repo.HTMLURL(), } body, err := mailRender.HTMLString(string(MAIL_NOTIFY_COLLABORATOR), data) if err != nil { @@ -153,8 +153,8 @@ func composeTplData(subject, body, link string) map[string]interface{} { func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []string, info string) *mailer.Message { subject := issue.MailSubject() - body := string(markdown.RenderSpecialLink([]byte(issue.Content), issue.Repo.FullLink(), issue.Repo.ComposeMetas())) - data := composeTplData(subject, body, issue.FullLink()) + body := string(markdown.RenderSpecialLink([]byte(issue.Content), issue.Repo.HTMLURL(), issue.Repo.ComposeMetas())) + data := composeTplData(subject, body, issue.HTMLURL()) data["Doer"] = doer content, err := mailRender.HTMLString(string(tplName), data) if err != nil { |