summaryrefslogtreecommitdiffstats
path: root/web.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-06 13:00:24 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-06 13:00:24 -0400
commitcd5b800a2119c20ac289a541ea8c1e0b226486fe (patch)
tree0a04b9cef603429509a48b6c576bca4aac15d45d /web.go
parent2846ff7d31fc93659a2e90fe869ff51c885decfa (diff)
parent583f11f27cb6d5d04a5198c6d4514a4da3cae92a (diff)
downloadgitea-cd5b800a2119c20ac289a541ea8c1e0b226486fe.tar.gz
gitea-cd5b800a2119c20ac289a541ea8c1e0b226486fe.zip
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'web.go')
-rw-r--r--web.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/web.go b/web.go
index 00fa72cbce..86c395e7bd 100644
--- a/web.go
+++ b/web.go
@@ -88,7 +88,7 @@ func runWeb(*cli.Context) {
m.Get("/avatar/:hash", avt.ServeHTTP)
m.Group("/user", func(r martini.Router) {
- // r.Any("/login/github", user.SocialSignIn)
+ r.Any("/login/github", user.SocialSignIn)
r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
r.Any("/forget_password", user.ForgotPasswd)