From: Peter Smit <peter@smitmail.eu>
Date: Thu, 5 Feb 2015 09:08:10 +0000 (+0200)
Subject: Merge branch 'dev' into newcollaboration
X-Git-Tag: v0.9.99~1438^2~19^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=03af37554e34582e8c5a9d98ec9f2d3c9884f0d8;p=gitea.git

Merge branch 'dev' into newcollaboration
---

03af37554e34582e8c5a9d98ec9f2d3c9884f0d8
diff --cc models/models.go
index cf4e291cff,df030e51bb..1a67041b4a
--- a/models/models.go
+++ b/models/models.go
@@@ -98,21 -97,18 +98,21 @@@ func getEngine() (*xorm.Engine, error) 
  func NewTestEngine(x *xorm.Engine) (err error) {
  	x, err = getEngine()
  	if err != nil {
- 		return fmt.Errorf("models.init(fail to connect to database): %v", err)
+ 		return fmt.Errorf("connect to database: %v", err)
  	}
  
 +	x.SetMapper(core.GonicMapper{})
  	return x.Sync(tables...)
  }
  
  func SetEngine() (err error) {
  	x, err = getEngine()
  	if err != nil {
- 		return fmt.Errorf("models.init(fail to connect to database): %v", err)
+ 		return fmt.Errorf("connect to database: %v", err)
  	}
  
 +	x.SetMapper(core.GonicMapper{})
 +
  	// WARNING: for serv command, MUST remove the output to os.stdout,
  	// so use log file to instead print to stdout.
  	logPath := path.Join(setting.LogRootPath, "xorm.log")