diff options
| -rw-r--r-- | cmd/web.go | 11 | ||||
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/auth/auth.go | 2 | ||||
| -rw-r--r-- | routers/user/auth.go | 3 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
5 files changed, 8 insertions, 12 deletions
@@ -230,7 +230,6 @@ func runWeb(ctx *cli.Context) error { }) m.Group("/user", func() { - // r.Get("/feeds", binding.Bind(form.Feeds{}), user.Feeds) m.Any("/activate", user.Activate) m.Any("/activate_email", user.ActivateEmail) m.Get("/email2user", user.Email2User) @@ -460,7 +459,10 @@ func runWeb(ctx *cli.Context) error { m.Group("/:username/:reponame", func() { m.Get("/issues", repo.RetrieveLabels, repo.Issues) m.Get("/issues/:index", repo.ViewIssue) - + m.Get("/labels/", repo.RetrieveLabels, repo.Labels) + m.Get("/milestones", repo.Milestones) + }, ignSignIn, context.RepoAssignment(true)) + m.Group("/:username/:reponame", func() { // FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest. // So they can apply their own enable/disable logic on routers. m.Group("/issues", func() { @@ -477,10 +479,7 @@ func runWeb(ctx *cli.Context) error { m.Post("", repo.UpdateCommentContent) m.Post("/delete", repo.DeleteComment) }) - - m.Get("/labels/", repo.RetrieveLabels, repo.Labels) - m.Get("/milestones", repo.Milestones) - }, ignSignIn, context.RepoAssignment(true)) + }, reqSignIn, context.RepoAssignment(true)) m.Group("/:username/:reponame", func() { m.Group("/wiki", func() { m.Get("/?:page", repo.Wiki) @@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.10.33.0329 / 0.11 RC" +const APP_VER = "0.10.34.0330 / 0.11 RC" func init() { setting.AppVer = APP_VER diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 6ec3afc6..42995ae3 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -67,7 +67,7 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 { if id, ok := uid.(int64); ok { if _, err := models.GetUserByID(id); err != nil { if !errors.IsUserNotExist(err) { - log.Error(2, "GetUserById: %v", err) + log.Error(2, "GetUserByID: %v", err) } return 0 } diff --git a/routers/user/auth.go b/routers/user/auth.go index 87fc03ba..be15e56e 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -154,9 +154,6 @@ func SignInPost(ctx *context.Context, f form.SignIn) { func SignOut(ctx *context.Context) { ctx.Session.Delete("uid") ctx.Session.Delete("uname") - ctx.Session.Delete("socialId") - ctx.Session.Delete("socialName") - ctx.Session.Delete("socialEmail") ctx.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl) ctx.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl) ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl) diff --git a/templates/.VERSION b/templates/.VERSION index f4a81194..e7e92bae 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.10.33.0329 / 0.11 RC
\ No newline at end of file +0.10.34.0330 / 0.11 RC
\ No newline at end of file |