diff options
author | Unknown <joe2010xtmf@163.com> | 2014-04-06 13:00:24 -0400 |
---|---|---|
committer | Unknown <joe2010xtmf@163.com> | 2014-04-06 13:00:24 -0400 |
commit | cd5b800a2119c20ac289a541ea8c1e0b226486fe (patch) | |
tree | 0a04b9cef603429509a48b6c576bca4aac15d45d /web.go | |
parent | 2846ff7d31fc93659a2e90fe869ff51c885decfa (diff) | |
parent | 583f11f27cb6d5d04a5198c6d4514a4da3cae92a (diff) | |
download | gitea-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.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |