diff options
| author | Stefan-Code <Stefan-Code@users.noreply.github.com> | 2015-02-18 11:12:41 +0100 |
|---|---|---|
| committer | Stefan-Code <Stefan-Code@users.noreply.github.com> | 2015-02-18 11:12:41 +0100 |
| commit | b508fb041ff83919eff6618a62658288745a2c1b (patch) | |
| tree | 7fb4a602afe87800e7f24957d9702ce38bbea643 /models | |
| parent | 1628ef4ba5120d338c0616e37153f9f9b2f8f236 (diff) | |
| parent | a307574fbcb58bed41017fb2262852327cf050d0 (diff) | |
Merge branch 'dev' of https://github.com/gogits/gogs into dev
Diffstat (limited to 'models')
| -rw-r--r-- | models/models.go | 10 | ||||
| -rw-r--r-- | models/repo.go | 1 | ||||
| -rw-r--r-- | models/webhook.go | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/models/models.go b/models/models.go index 3eeeabda..486aceac 100644 --- a/models/models.go +++ b/models/models.go @@ -15,7 +15,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" ) @@ -121,7 +121,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 @@ -136,9 +136,9 @@ func NewEngine() (err error) { return err } - if err = migrations.Migrate(x); err != nil { - return err - } + // if err = migrations.Migrate(x); err != nil { + // return err + // } if err = x.StoreEngine("InnoDB").Sync2(tables...); err != nil { return fmt.Errorf("sync database struct error: %v\n", err) diff --git a/models/repo.go b/models/repo.go index cdb838a1..179120a3 100644 --- a/models/repo.go +++ b/models/repo.go @@ -154,7 +154,6 @@ type Repository struct { IsPrivate bool IsBare bool - IsGoget bool IsMirror bool *Mirror `xorm:"-"` diff --git a/models/webhook.go b/models/webhook.go index 34349bb5..96af0b69 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -315,7 +315,7 @@ func DeliverHooks() { req := httplib.Post(t.Url).SetTimeout(timeout, timeout). Header("X-Gogs-Delivery", t.Uuid). Header("X-Gogs-Event", string(t.EventType)). - SetTLSClientConfig(&tls.Config{InsecureSkipVerify: setting.Webhook.AllowInsecureCertification}) + SetTLSClientConfig(&tls.Config{InsecureSkipVerify: setting.Webhook.SkipTLSVerify}) switch t.ContentType { case JSON: |