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

2014-04-04 17:27:02 +08:00 · 2014-04-04 17:27:02 +08:00 · e0d64d3168
parent 6b9f7fd758 b9a7dd72f8
commit e0d64d3168
1 changed files with 2 additions and 2 deletions
--- a/models/publickey.go
+++ b/models/publickey.go
@ -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"`