From 90eb9fb889e5d3a5845576dbc63e3792f3da33f2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 11 Nov 2021 15:03:30 +0800 Subject: Move EmailAddress & UserRedirect into models/user/ (#17607) * Move EmailAddress into models/user/ * Fix test * rename user_mail to user_email * Fix test * Move UserRedirect into models/user/ * Fix lint & test * Fix lint * Fix lint * remove nolint comment * Fix lint --- services/mailer/mail.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/mailer') diff --git a/services/mailer/mail.go b/services/mailer/mail.go index bd8f059c5e..b579bf383a 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -16,6 +16,7 @@ import ( texttmpl "text/template" "code.gitea.io/gitea/models" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/emoji" "code.gitea.io/gitea/modules/log" @@ -112,7 +113,7 @@ func SendResetPasswordMail(u *models.User) { } // SendActivateEmailMail sends confirmation email to confirm new email address -func SendActivateEmailMail(u *models.User, email *models.EmailAddress) { +func SendActivateEmailMail(u *models.User, email *user_model.EmailAddress) { if setting.MailService == nil { // No mail service configured return -- cgit v1.2.3