Merge branches 'dev' and 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
skyblue 2014-04-05 22:53:17 +08:00
commit 1336d8d54d
2 changed files with 41 additions and 39 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 not null"`
Name string `xorm:" not null"` //UNIQUE(s)
OwnerId int64 `xorm:"unique(s) index not null"`
Name string `xorm:"unique(s) not null"` //UNIQUE(s)
Fingerprint string
Content string `xorm:"TEXT not null"`
Created time.Time `xorm:"created"`