diff --git a/README.md b/README.md index f7f54f272..fe46b2bea 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current version: 0.8.11 +##### Current version: 0.8.12 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index 155fc6c03..89b255c3b 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.11.1219" +const APP_VER = "0.8.12.1219" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 571b19bf7..2d24d0ce5 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -125,6 +125,7 @@ func (ctx *Context) HasValue(name string) bool { // HTML calls Context.HTML and converts template name to string. func (ctx *Context) HTML(status int, name base.TplName) { + log.Debug("Template: %s", name) ctx.Context.HTML(status, string(name)) } @@ -241,6 +242,7 @@ func Contexter() macaron.Handler { ctx.Data["CsrfToken"] = x.GetToken() ctx.Data["CsrfTokenHtml"] = template.HTML(``) + log.Debug("CSRF Token: %v | %v", ctx.Data["CsrfToken"], ctx.GetCookie("_csrf")) ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding diff --git a/routers/repo/pull.go b/routers/repo/pull.go index ee018ebda..e3500716d 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -431,6 +431,7 @@ func ParseCompareInfo(ctx *middleware.Context) (*models.User, *models.Repository } return nil, nil, nil, nil, "", "" } + ctx.Data["HeadUser"] = headUser repo := ctx.Repo.Repository diff --git a/templates/.VERSION b/templates/.VERSION index 79b657a8d..3d67a16bd 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.11.1219 \ No newline at end of file +0.8.12.1219 \ No newline at end of file diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl index f1236c2ba..110dfa46b 100644 --- a/templates/repo/pulls/compare.tmpl +++ b/templates/repo/pulls/compare.tmpl @@ -21,7 +21,7 @@
@@ -39,7 +39,7 @@