diff options
| author | Jonas Östanbäck <cez81@users.noreply.github.com> | 2017-05-14 04:38:30 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-05-14 10:38:30 +0800 |
| commit | e214728725b304e92308f3c30235ec0d12dd5478 (patch) | |
| tree | 4693ca1691d8a760db1dc3fd78defa231b0faf8f /models | |
| parent | 9e627af9a449419bcec65ccff1dba00abc625d43 (diff) | |
| download | gitea-e214728725b304e92308f3c30235ec0d12dd5478.tar.gz gitea-e214728725b304e92308f3c30235ec0d12dd5478.zip | |
Add new text for reset password flash (#1718)
* Forgot password should use ResetPwdCodeLives, not ActiveCodeLives
* Improve documentation for different send mail functions related to password reset
* Improve documentation in conf/app.ini regarding xxx_CODE_LIVE_MINUTES settings
Diffstat (limited to 'models')
| -rw-r--r-- | models/mail.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/mail.go b/models/mail.go index 16e8c9e2ef..20ddde0cd0 100644 --- a/models/mail.go +++ b/models/mail.go @@ -65,7 +65,7 @@ func SendUserMail(c *macaron.Context, u *User, tpl base.TplName, code, subject, mailer.SendAsync(msg) } -// SendActivateAccountMail sends an activation mail to the user +// SendActivateAccountMail sends an activation mail to the user (new user registration) func SendActivateAccountMail(c *macaron.Context, u *User) { SendUserMail(c, u, mailAuthActivate, u.GenerateActivateCode(), c.Tr("mail.activate_account"), "activate account") } @@ -75,7 +75,7 @@ func SendResetPasswordMail(c *macaron.Context, u *User) { SendUserMail(c, u, mailAuthResetPassword, u.GenerateActivateCode(), c.Tr("mail.reset_password"), "reset password") } -// SendActivateEmailMail sends confirmation email. +// SendActivateEmailMail sends confirmation email to confirm new email address func SendActivateEmailMail(c *macaron.Context, u *User, email *EmailAddress) { data := map[string]interface{}{ "Username": u.DisplayName(), |