diff --git a/gogs.go b/gogs.go index 8d7139536..57a9ac871 100644 --- a/gogs.go +++ b/gogs.go @@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.143.0211" +const APP_VER = "0.9.144.0212" func init() { setting.AppVer = APP_VER diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 7bd6c7b9b..7307320d9 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -31,7 +31,7 @@ type InstallForm struct { SMTPHost string SMTPFrom string - SMTPEmail string `binding:"OmitEmpty;Email;MaxSize(254)" locale:"install.mailer_user"` + SMTPUser string `binding:"OmitEmpty;MaxSize(254)" locale:"install.mailer_user"` SMTPPasswd string RegisterConfirm bool MailNotify bool diff --git a/routers/install.go b/routers/install.go index 7929dfba0..1df875ae2 100644 --- a/routers/install.go +++ b/routers/install.go @@ -150,7 +150,7 @@ func Install(ctx *context.Context) { if setting.MailService != nil { form.SMTPHost = setting.MailService.Host form.SMTPFrom = setting.MailService.From - form.SMTPEmail = setting.MailService.User + form.SMTPUser = setting.MailService.User } form.RegisterConfirm = setting.Service.RegisterEmailConfirm form.MailNotify = setting.Service.EnableNotifyMail @@ -317,7 +317,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("mailer").Key("ENABLED").SetValue("true") cfg.Section("mailer").Key("HOST").SetValue(form.SMTPHost) cfg.Section("mailer").Key("FROM").SetValue(form.SMTPFrom) - cfg.Section("mailer").Key("USER").SetValue(form.SMTPEmail) + cfg.Section("mailer").Key("USER").SetValue(form.SMTPUser) cfg.Section("mailer").Key("PASSWD").SetValue(form.SMTPPasswd) } else { cfg.Section("mailer").Key("ENABLED").SetValue("false") diff --git a/templates/.VERSION b/templates/.VERSION index ca81beaba..cc495a4ae 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.143.0211 \ No newline at end of file +0.9.144.0212 \ No newline at end of file diff --git a/templates/install.tmpl b/templates/install.tmpl index c8c2cbd05..3dd3e9851 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -135,9 +135,9 @@ {{.i18n.Tr "install.smtp_from_helper"}} -
- - +
+ +