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

1 files changed, 7 insertions, 2 deletions

diff --git a/web.go b/web.go
index 024a80f9..77226f57 100644
--- a/web.go
+++ b/web.go
@@ -48,10 +48,15 @@ func runWeb(*cli.Context) {
 
 	// Routers.
 	m.Get("/", routers.Dashboard)
-	m.Get("/user/signin", user.SignIn)
+	m.Any("/login", user.SignIn)
+	m.Any("/user/signin", user.SignIn)
+
+	m.Any("/sign-up", user.SignUp)
 	m.Any("/user/signup", user.SignUp)
+
+	m.Get("/user/profile", user.Profile) // should be /username
 	m.Any("/user/delete", user.Delete)
-	m.Any("/user/publickey/add", user.AddPublickKey)
+	m.Any("/user/publickey/add", user.AddPublicKey)
 	m.Any("/repo/create", repo.Create)
 	m.Any("/repo/delete", repo.Delete)