MSG-AFTER`, att1.UUID)
require.NoError(t, issues_model.UpdateIssueCols(t.Context(), issue, "content"))
diff --git a/services/mailer/mail_user.go b/services/mailer/mail_user.go
index 68df81f6a3..867a8b2a8f 100644
--- a/services/mailer/mail_user.go
+++ b/services/mailer/mail_user.go
@@ -7,7 +7,6 @@ import (
"bytes"
"fmt"
- repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
@@ -18,11 +17,10 @@ import (
)
const (
- mailAuthActivate templates.TplName = "auth/activate"
- mailAuthActivateEmail templates.TplName = "auth/activate_email"
- mailAuthResetPassword templates.TplName = "auth/reset_passwd"
- mailAuthRegisterNotify templates.TplName = "auth/register_notify"
- mailNotifyCollaborator templates.TplName = "notify/collaborator"
+ mailAuthActivate templates.TplName = "user/auth/activate"
+ mailAuthActivateEmail templates.TplName = "user/auth/activate_email"
+ mailAuthResetPassword templates.TplName = "user/auth/reset_passwd"
+ mailAuthRegisterNotify templates.TplName = "user/auth/register_notify"
)
// sendUserMail sends a mail to the user
@@ -128,34 +126,3 @@ func SendRegisterNotifyMail(u *user_model.User) {
SendAsync(msg)
}
-
-// SendCollaboratorMail sends mail notification to new collaborator.
-func SendCollaboratorMail(u, doer *user_model.User, repo *repo_model.Repository) {
- if setting.MailService == nil || !u.IsActive {
- // No mail service configured OR the user is inactive
- return
- }
- locale := translation.NewLocale(u.Language)
- repoName := repo.FullName()
-
- subject := locale.TrString("mail.repo.collaborator.added.subject", doer.DisplayName(), repoName)
- data := map[string]any{
- "locale": locale,
- "Subject": subject,
- "RepoName": repoName,
- "Link": repo.HTMLURL(),
- "Language": locale.Language(),
- }
-
- var content bytes.Buffer
-
- if err := LoadedTemplates().BodyTemplates.ExecuteTemplate(&content, string(mailNotifyCollaborator), data); err != nil {
- log.Error("Template: %v", err)
- return
- }
-
- msg := sender_service.NewMessage(u.EmailTo(), subject, content.String())
- msg.Info = fmt.Sprintf("UID: %d, add collaborator", u.ID)
-
- SendAsync(msg)
-}
diff --git a/services/mailer/mail_workflow_run.go b/services/mailer/mail_workflow_run.go
index 62e8552159..3789102812 100644
--- a/services/mailer/mail_workflow_run.go
+++ b/services/mailer/mail_workflow_run.go
@@ -8,6 +8,7 @@ import (
"context"
"fmt"
"sort"
+ "time"
actions_model "code.gitea.io/gitea/models/actions"
repo_model "code.gitea.io/gitea/models/repo"
@@ -15,18 +16,20 @@ import (
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/services/convert"
sender_service "code.gitea.io/gitea/services/mailer/sender"
)
-const tplWorkflowRun = "notify/workflow_run"
+const tplWorkflowRun templates.TplName = "repo/actions/workflow_run"
type convertedWorkflowJob struct {
- HTMLURL string
- Status actions_model.Status
- Name string
- Attempt int64
+ HTMLURL string
+ Name string
+ Status actions_model.Status
+ Attempt int64
+ Duration time.Duration
}
func generateMessageIDForActionsWorkflowRunStatusEmail(repo *repo_model.Repository, run *actions_model.ActionRun) string {
@@ -45,16 +48,15 @@ func composeAndSendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo
}
}
- subject := "Run"
+ var subjectTrString string
switch run.Status {
case actions_model.StatusFailure:
- subject += " failed"
+ subjectTrString = "mail.repo.actions.run.failed"
case actions_model.StatusCancelled:
- subject += " cancelled"
+ subjectTrString = "mail.repo.actions.run.cancelled"
case actions_model.StatusSuccess:
- subject += " succeeded"
+ subjectTrString = "mail.repo.actions.run.succeeded"
}
- subject = fmt.Sprintf("%s: %s (%s)", subject, run.WorkflowID, base.ShortSha(run.CommitSHA))
displayName := fromDisplayName(sender)
messageID := generateMessageIDForActionsWorkflowRunStatusEmail(repo, run)
metadataHeaders := generateMetadataHeaders(repo)
@@ -80,10 +82,11 @@ func composeAndSendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo
continue
}
convertedJobs = append(convertedJobs, convertedWorkflowJob{
- HTMLURL: converted0.HTMLURL,
- Name: converted0.Name,
- Status: job.Status,
- Attempt: converted0.RunAttempt,
+ HTMLURL: converted0.HTMLURL,
+ Name: converted0.Name,
+ Status: job.Status,
+ Attempt: converted0.RunAttempt,
+ Duration: job.Duration(),
})
}
@@ -93,27 +96,28 @@ func composeAndSendActionsWorkflowRunStatusEmail(ctx context.Context, repo *repo
}
for lang, tos := range langMap {
locale := translation.NewLocale(lang)
- var runStatusText string
+ var runStatusTrString string
switch run.Status {
case actions_model.StatusSuccess:
- runStatusText = "All jobs have succeeded"
+ runStatusTrString = "mail.repo.actions.jobs.all_succeeded"
case actions_model.StatusFailure:
- runStatusText = "All jobs have failed"
+ runStatusTrString = "mail.repo.actions.jobs.all_failed"
for _, job := range jobs {
if !job.Status.IsFailure() {
- runStatusText = "Some jobs were not successful"
+ runStatusTrString = "mail.repo.actions.jobs.some_not_successful"
break
}
}
case actions_model.StatusCancelled:
- runStatusText = "All jobs have been cancelled"
+ runStatusTrString = "mail.repo.actions.jobs.all_cancelled"
}
+ subject := fmt.Sprintf("%s: %s (%s)", locale.TrString(subjectTrString), run.WorkflowID, base.ShortSha(run.CommitSHA))
var mailBody bytes.Buffer
- if err := LoadedTemplates().BodyTemplates.ExecuteTemplate(&mailBody, tplWorkflowRun, map[string]any{
+ if err := LoadedTemplates().BodyTemplates.ExecuteTemplate(&mailBody, string(tplWorkflowRun), map[string]any{
"Subject": subject,
"Repo": repo,
"Run": run,
- "RunStatusText": runStatusText,
+ "RunStatusText": locale.TrString(runStatusTrString),
"Jobs": convertedJobs,
"locale": locale,
}); err != nil {
diff --git a/services/migrations/error.go b/services/migrations/error.go
index 9b470149bf..2dd9647d95 100644
--- a/services/migrations/error.go
+++ b/services/migrations/error.go
@@ -7,7 +7,7 @@ package migrations
import (
"errors"
- "github.com/google/go-github/v71/github"
+ "github.com/google/go-github/v74/github"
)
// ErrRepoNotCreated returns the error that repository not created
diff --git a/services/migrations/github.go b/services/migrations/github.go
index a8a89dce0b..ae7350c016 100644
--- a/services/migrations/github.go
+++ b/services/migrations/github.go
@@ -20,7 +20,7 @@ import (
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/structs"
- "github.com/google/go-github/v71/github"
+ "github.com/google/go-github/v74/github"
"golang.org/x/oauth2"
)
diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go
index a19a04bc44..260fa9cd5d 100644
--- a/services/migrations/gitlab.go
+++ b/services/migrations/gitlab.go
@@ -50,7 +50,7 @@ func (f *GitlabDownloaderFactory) New(ctx context.Context, opts base.MigrateOpti
log.Trace("Create gitlab downloader. BaseURL: %s RepoName: %s", baseURL, repoNameSpace)
- return NewGitlabDownloader(ctx, baseURL, repoNameSpace, opts.AuthUsername, opts.AuthPassword, opts.AuthToken)
+ return NewGitlabDownloader(ctx, baseURL, repoNameSpace, opts.AuthToken)
}
// GitServiceType returns the type of git service
@@ -93,14 +93,8 @@ type GitlabDownloader struct {
//
// Use either a username/password, personal token entered into the username field, or anonymous/public access
// Note: Public access only allows very basic access
-func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, password, token string) (*GitlabDownloader, error) {
+func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, token string) (*GitlabDownloader, error) {
gitlabClient, err := gitlab.NewClient(token, gitlab.WithBaseURL(baseURL), gitlab.WithHTTPClient(NewMigrationHTTPClient()))
- // Only use basic auth if token is blank and password is NOT
- // Basic auth will fail with empty strings, but empty token will allow anonymous public API usage
- if token == "" && password != "" {
- gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL), gitlab.WithHTTPClient(NewMigrationHTTPClient()))
- }
-
if err != nil {
log.Trace("Error logging into gitlab: %v", err)
return nil, err
@@ -206,7 +200,7 @@ func (g *GitlabDownloader) GetTopics(ctx context.Context) ([]string, error) {
if err != nil {
return nil, err
}
- return gr.TagList, err
+ return gr.Topics, err
}
// GetMilestones returns milestones
diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go
index 73a1b6a276..a9ae89a2a3 100644
--- a/services/migrations/gitlab_test.go
+++ b/services/migrations/gitlab_test.go
@@ -31,7 +31,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
t.Skipf("Can't access test repo, skipping %s", t.Name())
}
ctx := t.Context()
- downloader, err := NewGitlabDownloader(ctx, "https://gitlab.com", "gitea/test_repo", "", "", gitlabPersonalAccessToken)
+ downloader, err := NewGitlabDownloader(ctx, "https://gitlab.com", "gitea/test_repo", gitlabPersonalAccessToken)
if err != nil {
t.Fatalf("NewGitlabDownloader is nil: %v", err)
}
diff --git a/templates/admin/config_settings/avatars.tmpl b/templates/admin/config_settings/avatars.tmpl
new file mode 100644
index 0000000000..1fc761034d
--- /dev/null
+++ b/templates/admin/config_settings/avatars.tmpl
@@ -0,0 +1,20 @@
+
+
diff --git a/templates/admin/config_settings/config_settings.tmpl b/templates/admin/config_settings/config_settings.tmpl
new file mode 100644
index 0000000000..1ef764a58b
--- /dev/null
+++ b/templates/admin/config_settings/config_settings.tmpl
@@ -0,0 +1,7 @@
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+
+{{template "admin/config_settings/avatars" .}}
+
+{{template "admin/config_settings/repository" .}}
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/config_settings.tmpl b/templates/admin/config_settings/repository.tmpl
similarity index 51%
rename from templates/admin/config_settings.tmpl
rename to templates/admin/config_settings/repository.tmpl
index 9bd37afa7d..9a37707835 100644
--- a/templates/admin/config_settings.tmpl
+++ b/templates/admin/config_settings/repository.tmpl
@@ -1,25 +1,3 @@
-{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-
-
-
@@ -48,4 +26,3 @@
-{{template "admin/layout_footer" .}}
diff --git a/templates/mail/org/team_invite.devtest.yml b/templates/mail/org/team_invite.devtest.yml
new file mode 100644
index 0000000000..dc51a74d64
--- /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/team_invite.tmpl b/templates/mail/org/team_invite.tmpl
similarity index 86%
rename from templates/mail/team_invite.tmpl
rename to templates/mail/org/team_invite.tmpl
index cb0c0c0a50..a531e8c3b5 100644
--- a/templates/mail/team_invite.tmpl
+++ b/templates/mail/org/team_invite.tmpl
@@ -10,6 +10,6 @@
{{.locale.Tr "mail.link_not_working_do_paste"}}
{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}
- © {{AppName}}
+ © {{AppName}}