diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/middleware/context.go | 2 | ||||
| -rw-r--r-- | routers/repo/pull.go | 1 | ||||
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/pulls/compare.tmpl | 4 |
6 files changed, 8 insertions, 5 deletions
@@ -3,7 +3,7 @@ Gogs - Go Git Service [ -##### Current version: 0.8.11 +##### Current version: 0.8.12 | Web | UI | Preview | |:-------------:|:-------:|:-------:| @@ -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 571b19bf73..2d24d0ce58 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(`<input type="hidden" name="_csrf" value="` + x.GetToken() + `">`) + 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 ee018ebda7..e3500716d3 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 79b657a8d1..3d67a16bda 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 f1236c2ba6..110dfa46b3 100644 --- a/templates/repo/pulls/compare.tmpl +++ b/templates/repo/pulls/compare.tmpl @@ -21,7 +21,7 @@ </div> <div class="scrolling menu"> {{range .Branches}} - <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{.}}...{{$.SignedUser.Name}}:{{$.HeadBranch}}">{{.}}</div> + <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{.}}...{{$.HeadUser.Name}}:{{$.HeadBranch}}">{{.}}</div> {{end}} </div> </div> @@ -39,7 +39,7 @@ </div> <div class="scrolling menu"> {{range .HeadBranches}} - <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{$.BaseBranch}}...{{$.SignedUser.Name}}:{{.}}">{{.}}</div> + <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{$.BaseBranch}}...{{$.HeadUser.Name}}:{{.}}">{{.}}</div> {{end}} </div> </div> |