opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-07-15 05:01:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix git hooks update to receive required arguments. Fixes #2090 (#2095)

Browse Source 
* Changed migration calling so that migrations can use models package
This commit is contained in:
Lauris BH
2017-07-02 16:50:57 +03:00
committed by Lunny Xiao
parent f99489d5c5
commit f189ccd2d6
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
models/models.go
View File

@ -24,7 +24,6 @@ import (
// Needed for the MSSSQL driver
_ "github.com/denisenkom/go-mssqldb"
"code.gitea.io/gitea/models/migrations"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
@ -259,7 +258,7 @@ func SetEngine() (err error) {
}
// NewEngine initializes a new xorm.Engine
func NewEngine() (err error) {
func NewEngine(migrateFunc func(*xorm.Engine) error) (err error) {
if err = SetEngine(); err != nil {
return err
}
@ -268,7 +267,7 @@ func NewEngine() (err error) {
return err
}
if err = migrations.Migrate(x); err != nil {
if err = migrateFunc(x); err != nil {
return fmt.Errorf("migrate: %v", err)
}