Browse Source

#2014 allow switch branches between two orgs in compose PR

Unknwon 7 years ago
parent
commit
c62a6b7a12
6 changed files with 8 additions and 5 deletions
  1. 1 1
      README.md
  2. 1 1
      gogs.go
  3. 2 0
      modules/middleware/context.go
  4. 1 0
      routers/repo/pull.go
  5. 1 1
      templates/.VERSION
  6. 2 2
      templates/repo/pulls/compare.tmpl

+ 1 - 1
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  |
 |:-------------:|:-------:|:-------:|

+ 1 - 1
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())

+ 2 - 0
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

+ 1 - 0
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
 

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.8.11.1219
+0.8.12.1219

+ 2 - 2
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>