mirror of
https://github.com/go-gitea/gitea
synced 2024-08-19 05:40:43 +02:00
Fix #214
This commit is contained in:
parent
9c3aa6936a
commit
63baf76ab2
2
gogs.go
2
gogs.go
@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.4.1.0602 Alpha"
|
const APP_VER = "0.4.1.0603 Alpha"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
@ -26,7 +26,7 @@ func NewMailMessageFrom(To []string, from, subject, body string) Message {
|
|||||||
|
|
||||||
// Create New mail message use MailFrom and MailUser
|
// Create New mail message use MailFrom and MailUser
|
||||||
func NewMailMessage(To []string, subject, body string) Message {
|
func NewMailMessage(To []string, subject, body string) Message {
|
||||||
return NewMailMessageFrom(To, setting.MailService.User, subject, body)
|
return NewMailMessageFrom(To, setting.MailService.From, subject, body)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMailTmplData(user *models.User) map[interface{}]interface{} {
|
func GetMailTmplData(user *models.User) map[interface{}]interface{} {
|
||||||
|
@ -330,6 +330,7 @@ func newSessionService() {
|
|||||||
type Mailer struct {
|
type Mailer struct {
|
||||||
Name string
|
Name string
|
||||||
Host string
|
Host string
|
||||||
|
From string
|
||||||
User, Passwd string
|
User, Passwd string
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -363,6 +364,7 @@ func newMailService() {
|
|||||||
User: Cfg.MustValue("mailer", "USER"),
|
User: Cfg.MustValue("mailer", "USER"),
|
||||||
Passwd: Cfg.MustValue("mailer", "PASSWD"),
|
Passwd: Cfg.MustValue("mailer", "PASSWD"),
|
||||||
}
|
}
|
||||||
|
MailService.From = Cfg.MustValue("mailer", "FROM", MailService.User)
|
||||||
log.Info("Mail Service Enabled")
|
log.Info("Mail Service Enabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
0.4.1.0602 Alpha
|
0.4.1.0603 Alpha
|
Loading…
Reference in New Issue
Block a user