diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-05 15:30:49 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-05 15:30:49 +0800 |
| commit | a92826a8feee904440d86fd851ac4ecce35520fd (patch) | |
| tree | e813b36b2b6db0807e02abd61a4f220a971cc84e /models/publickey.go | |
| parent | 493b0c5ac212a28f46938cf8dfb2efb79f658548 (diff) | |
| parent | e41ab839c7dbbdffc60a4e02775f24add9d126d9 (diff) | |
| download | gitea-a92826a8feee904440d86fd851ac4ecce35520fd.tar.gz gitea-a92826a8feee904440d86fd851ac4ecce35520fd.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
routers/repo/repo.go
Diffstat (limited to 'models/publickey.go')
| -rw-r--r-- | models/publickey.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/publickey.go b/models/publickey.go index 3f2fcabd3b..42d2523b5f 100644 --- 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:" index not null"` + Name string `xorm:" not null"` //UNIQUE(s) Fingerprint string Content string `xorm:"TEXT not null"` Created time.Time `xorm:"created"` |