aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuo Yifei <gdutyifei@163.com>2019-02-12 16:37:32 +0800
committerLauris BH <lauris@nix.lv>2019-02-12 10:37:32 +0200
commit7884353a04dfcb1e03b4b26801dc90e7d0d67a5b (patch)
treed7e1f6e7d66c5406bb20c76223df4b789fe15744
parentbaffea1ddb7e4424dbca7f8ab5f1de8cf17c8691 (diff)
downloadgitea-7884353a04dfcb1e03b4b26801dc90e7d0d67a5b.tar.gz
gitea-7884353a04dfcb1e03b4b26801dc90e7d0d67a5b.zip
Add the Owner Name to differentiate when merging (#3807)
-rw-r--r--routers/repo/pull.go2
-rw-r--r--templates/repo/pulls/compare.tmpl8
2 files changed, 6 insertions, 4 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index a65b68a96e..043fc5c93a 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -692,8 +692,10 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *
if isSameRepo {
headRepo = ctx.Repo.Repository
headGitRepo = ctx.Repo.GitRepo
+ ctx.Data["BaseName"] = headUser.Name
} else {
headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name))
+ ctx.Data["BaseName"] = baseRepo.OwnerName
if err != nil {
ctx.ServerError("OpenRepository", err)
return nil, nil, nil, nil, "", ""
diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl
index 5b71fa5217..d2e00ace36 100644
--- a/templates/repo/pulls/compare.tmpl
+++ b/templates/repo/pulls/compare.tmpl
@@ -11,7 +11,7 @@
<span class="octicon octicon-git-compare"></span>
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
<div class="ui basic small button">
- <span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseBranch}}</span>
+ <span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
@@ -21,7 +21,7 @@
</div>
<div class="scrolling menu">
{{range .Branches}}
- <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{EscapePound .}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound $.HeadBranch}}">{{.}}</div>
+ <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{EscapePound .}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound $.HeadBranch}}">{{$.BaseName}}:{{.}}</div>
{{end}}
</div>
</div>
@@ -29,7 +29,7 @@
...
<div class="ui floating filter dropdown">
<div class="ui basic small button">
- <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadBranch}}</span>
+ <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadUser.Name}}:{{$.HeadBranch}}</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
@@ -39,7 +39,7 @@
</div>
<div class="scrolling menu">
{{range .HeadBranches}}
- <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{EscapePound $.BaseBranch}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound .}}">{{.}}</div>
+ <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{EscapePound $.BaseBranch}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound .}}">{{$.HeadUser.Name}}:{{.}}</div>
{{end}}
</div>
</div>