diff --git a/templates/mail/org/team_invite.devtest.yml b/templates/mail/org/team_invite.devtest.yml new file mode 100644 index 00000000000..dc51a74d641 --- /dev/null +++ b/templates/mail/org/team_invite.devtest.yml @@ -0,0 +1,13 @@ +Inviter: + DisplayName: Inviter Display Name + +Team: + Name: Team name + +Organization: + DisplayName: Organization Display Name + +InviteURL: http://localhost/org/team/invite + +Invite: + Email: invited@example.com diff --git a/templates/mail/repo/actions/workflow_run.devtest.yml b/templates/mail/repo/actions/workflow_run.devtest.yml index 1e285be328b..3d93ad45a3a 100644 --- a/templates/mail/repo/actions/workflow_run.devtest.yml +++ b/templates/mail/repo/actions/workflow_run.devtest.yml @@ -1,10 +1,10 @@ -RunStatusText: run status text .... +RunStatusText: Jobs status aggregation Repo: - FullName: RepoName + FullName: Repo/Name Run: - WorkflowID: WorkflowID + WorkflowID: workflow.yml HTMLURL: http://localhost/run/1 Jobs: @@ -13,6 +13,6 @@ Jobs: Attempt: 1 HTMLURL: http://localhost/job/1 - Name: Job-Name-2 - Status: failed + Status: failure Attempt: 2 HTMLURL: http://localhost/job/2 diff --git a/templates/mail/repo/collaborator.devtest.yml b/templates/mail/repo/collaborator.devtest.yml new file mode 100644 index 00000000000..8d8f2b27333 --- /dev/null +++ b/templates/mail/repo/collaborator.devtest.yml @@ -0,0 +1,3 @@ +Subject: Collaborator added +Link: http://localhost +RepoName: Repo/Name diff --git a/templates/mail/repo/collaborator.tmpl b/templates/mail/repo/collaborator.tmpl index 9810c709842..3fe490e2211 100644 --- a/templates/mail/repo/collaborator.tmpl +++ b/templates/mail/repo/collaborator.tmpl @@ -1,16 +1,13 @@ - {{.Subject}}

{{.locale.Tr "mail.repo.collaborator.added.text"}} {{.RepoName}}

-
+

---
diff --git a/templates/mail/repo/issue/assigned.devtest.yml b/templates/mail/repo/issue/assigned.devtest.yml new file mode 100644 index 00000000000..69a5cce1b01 --- /dev/null +++ b/templates/mail/repo/issue/assigned.devtest.yml @@ -0,0 +1,11 @@ +Subject: Issue assigned +Link: http://localhost + +Issue: + Index: 1 + Repo: + FullName: Repo/Name + HTMLURL: http://localhost/issue + +Doer: + Name: DoerName diff --git a/templates/mail/repo/issue/assigned.tmpl b/templates/mail/repo/issue/assigned.tmpl index 5720319ee84..cdba7a0ad07 100644 --- a/templates/mail/repo/issue/assigned.tmpl +++ b/templates/mail/repo/issue/assigned.tmpl @@ -1,9 +1,6 @@ - {{.Subject}} @@ -18,7 +15,7 @@ {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}} {{end}}

-
+

---
diff --git a/templates/mail/repo/issue/default.tmpl b/templates/mail/repo/issue/default.tmpl index 395b118d3ef..f06ce4ae243 100644 --- a/templates/mail/repo/issue/default.tmpl +++ b/templates/mail/repo/issue/default.tmpl @@ -6,7 +6,6 @@ @@ -50,12 +49,12 @@ {{end}}

-
-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

+ diff --git a/templates/mail/repo/transfer.devtest.yml b/templates/mail/repo/transfer.devtest.yml new file mode 100644 index 00000000000..e2ec67c6429 --- /dev/null +++ b/templates/mail/repo/transfer.devtest.yml @@ -0,0 +1,3 @@ +Subject: Repository transfer +Link: http://localhost +Repo: Repo/Name diff --git a/templates/mail/repo/transfer.tmpl b/templates/mail/repo/transfer.tmpl index 8c8b276484e..43083b97b73 100644 --- a/templates/mail/repo/transfer.tmpl +++ b/templates/mail/repo/transfer.tmpl @@ -10,10 +10,12 @@

{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}

-

- --- -
- {{.locale.Tr "mail.view_it_on" AppName}}. -

+ diff --git a/templates/mail/user/auth/activate_email.devtest.yml b/templates/mail/user/auth/activate_email.devtest.yml index f5519a6f6c0..41d1ae029f6 100644 --- a/templates/mail/user/auth/activate_email.devtest.yml +++ b/templates/mail/user/auth/activate_email.devtest.yml @@ -1,3 +1,4 @@ DisplayName: User Display Name Code: The-Activation-Code +Email: admin@example.com ActiveCodeLives: 24h diff --git a/templates/mail/user/auth/reset_passwd.devtest.yml b/templates/mail/user/auth/reset_passwd.devtest.yml index 4c73d6b952d..f4269ebeb7d 100644 --- a/templates/mail/user/auth/reset_passwd.devtest.yml +++ b/templates/mail/user/auth/reset_passwd.devtest.yml @@ -1,3 +1,3 @@ DisplayName: User Display Name -Code: The-Activation-Code +Code: The-Reset-Token ResetPwdCodeLives: 24h