domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Merge branch 'dev' of github.com:gogits/gogs into access

Browse source 
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
This commit is contained in:
Unknwon 2015-02-22 22:51:25 -05:00
commit 7ccab9cd09
65 changed files with 477 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

4
models/models.go
View file

@ -16,7 +16,7 @@ import (
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"
"github.com/gogits/gogs/models/migrations"
// "github.com/gogits/gogs/models/migrations"
"github.com/gogits/gogs/modules/setting"
)
@ -140,7 +140,7 @@ func SetEngine() (err error) {
if err != nil {
return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
}
x.Logger = xorm.NewSimpleLogger(f)
x.SetLogger(xorm.NewSimpleLogger(f))
x.ShowSQL = true
x.ShowInfo = true