diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-04 10:34:18 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-04 10:34:18 -0400 |
| commit | 4a4997a3c7b5972624ccc9dc6bb156705e9c1e67 (patch) | |
| tree | 8cfb016c545a0b7583fcb7e7acc5a11fc11c20a2 | |
| parent | 75db79b4b6bcb8f61dd957c9bd21b32d4746f866 (diff) | |
| parent | 48d3a1fef12242c6f5c1848ca58e02d946a709da (diff) | |
Merge branch 'master' of github.com:gogits/gogs into dev
| -rw-r--r-- | .gopmfile | 3 | ||||
| -rw-r--r-- | models/publickey.go | 4 | ||||
| -rw-r--r-- | routers/repo/repo.go | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -19,6 +19,9 @@ github.com/gogits/gfm= github.com/gogits/cache= github.com/gogits/session= github.com/gogits/webdav= +github.com/martini-contrib/oauth2= +github.com/martini-contrib/sessions= +code.google.com/p/goauth2= [res] include=templates|public|conf diff --git a/models/publickey.go b/models/publickey.go index 3f2fcabd..ed47ff20 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:"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"` diff --git a/routers/repo/repo.go b/routers/repo/repo.go index ae51c551..bc41345a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -246,10 +246,10 @@ func Http(ctx *middleware.Context, params martini.Params) { reponame = reponame[:len(reponame)-4] } + dir := models.RepoPath(username, reponame) prefix := path.Join("/", username, params["reponame"]) server := webdav.NewServer( - models.RepoPath(username, reponame), - prefix, true) + dir, prefix, true) server.ServeHTTP(ctx.ResponseWriter, ctx.Req) } |