diff options
| author | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
| commit | 887bc1b594ef5c279c28c90009e67b068978482f (patch) | |
| tree | d4390bf5b8a6b4f581fc322a3290e69315060b78 /models | |
| parent | 884bc4ffd81f5b952df172d43ba7b16e1844ff19 (diff) | |
| parent | 2aea247208d4429d111fb9725c16a8e9ea24860f (diff) | |
| download | gitea-887bc1b594ef5c279c28c90009e67b068978482f.tar.gz gitea-887bc1b594ef5c279c28c90009e67b068978482f.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
Diffstat (limited to 'models')
| -rw-r--r-- | models/migrations/migrations.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 30c69fa301..d9a971e057 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -97,6 +97,9 @@ func Migrate(x *xorm.Engine) error { } v := currentVersion.Version + if int(v) > len(migrations) { + return nil + } for i, m := range migrations[v-_MIN_DB_VER:] { log.Info("Migration: %s", m.Description()) if err = m.Migrate(x); err != nil { |