diff options
| -rw-r--r-- | cmd/web.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 25 |
2 files changed, 14 insertions, 13 deletions
@@ -84,7 +84,7 @@ func checkVersion() { // Check dependency version. checkers := []VerChecker{ - {"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.5.5"}, + {"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.6.0"}, {"github.com/go-macaron/binding", binding.Version, "0.3.2"}, {"github.com/go-macaron/cache", cache.Version, "0.1.2"}, {"github.com/go-macaron/csrf", csrf.Version, "0.1.0"}, diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 1ca6b7c5..8e4b3cfa 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -113,13 +113,14 @@ var ( // Repository settings Repository struct { - AnsiCharset string - ForcePrivate bool - MaxCreationLimit int - MirrorQueueLength int - PullRequestQueueLength int - PreferredLicenses []string - DisableHTTPGit bool `ini:"DISABLE_HTTP_GIT"` + AnsiCharset string + ForcePrivate bool + MaxCreationLimit int + MirrorQueueLength int + PullRequestQueueLength int + PreferredLicenses []string + DisableHTTPGit bool `ini:"DISABLE_HTTP_GIT"` + EnableLocalPathMigration bool // Repository editor settings Editor struct { @@ -759,11 +760,11 @@ func newMailService() { } MailService.From = sec.Key("FROM").MustString(MailService.User) - parsed, err := mail.ParseAddress(MailService.From) - if err != nil { - log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err) - } - MailService.FromEmail = parsed.Address + parsed, err := mail.ParseAddress(MailService.From) + if err != nil { + log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err) + } + MailService.FromEmail = parsed.Address log.Info("Mail Service Enabled") } |