From 4586c386e7fb41e3f7b673a120d661399703af87 Mon Sep 17 00:00:00 2001
From: Martin Garton <martin.garton@ft.com>
Date: Wed, 2 Apr 2014 20:35:29 +0100
Subject: [PATCH 1/3] fix unique

---
 models/publickey.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/publickey.go b/models/publickey.go
index 3f2fcabd3b45..ed47ff209d0b 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"`

From 6b9f7fd75883ebf9b38db87b9c22985f24fe4a54 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 4 Apr 2014 17:26:46 +0800
Subject: [PATCH 2/3] basiclly http push

---
 routers/repo/repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 1cd3dd86baa3..f45d063b5e02 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -245,10 +245,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)
 }

From fa34656b5dd914938950da6ce95230caab733da7 Mon Sep 17 00:00:00 2001
From: Wind0r <Wind0r@users.noreply.github.com>
Date: Fri, 4 Apr 2014 12:25:14 +0200
Subject: [PATCH 3/3] Add missing deps

---
 .gopmfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gopmfile b/.gopmfile
index 9857af3502ee..ae92d45e3f58 100644
--- a/.gopmfile
+++ b/.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