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

Conflicts:
	routers/user/user.go
	web.go
This commit is contained in:
slene 2014-03-15 20:39:56 +08:00
commit a33d03f008
9 changed files with 42 additions and 16 deletions

2
web.go
View file

@ -49,7 +49,7 @@ func runWeb(*cli.Context) {
m.Use(middleware.InitContext())
// Routers.
m.Get("/", middleware.SignInRequire(false), routers.Home)
m.Get("/", middleware.SignInRequire(true), routers.Home)
m.Any("/user/login", middleware.SignOutRequire(), binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
m.Any("/user/logout", middleware.SignInRequire(true), user.SignOut)
m.Any("/user/sign_up", middleware.SignOutRequire(), binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)