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

This commit is contained in:
Unknown 2014-04-04 10:34:18 -04:00
commit 4a4997a3c7
3 changed files with 7 additions and 4 deletions

View file

@ -77,8 +77,8 @@ func init() {
// PublicKey represents a SSH key of user.
type PublicKey struct {
Id int64
OwnerId int64 `xorm:"index"`
Name string `xorm:"unique not null"`
OwnerId int64 `xorm:"unique(s) index not null"`
Name string `xorm:"unique(s) not null"`
Fingerprint string
Content string `xorm:"TEXT not null"`
Created time.Time `xorm:"created"`