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

.gopmfile

@@ -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

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"`

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)
 }