Fix new pull request link (#3133)
* Fix new pull request link * Only show button for branches
This commit is contained in:
parent
e693fda325
commit
0b77dbc11c
|
@ -427,7 +427,6 @@ func RepoAssignment() macaron.Handler {
|
|||
return
|
||||
}
|
||||
}
|
||||
ctx.Data["IsForkedRepo"] = repo.IsFork
|
||||
|
||||
// People who have push access or have forked repository can propose a new pull request.
|
||||
if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) {
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
</div>
|
||||
{{template "repo/sub_menu" .}}
|
||||
<div class="ui secondary menu">
|
||||
{{if .PullRequestCtx.Allowed}}
|
||||
{{if and .PullRequestCtx.Allowed .IsViewBranch}}
|
||||
<div class="fitted item">
|
||||
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{if .IsForkedRepo}}{{.Repository.Owner.Name}}:{{else}}{{if .SignedUser.HasForkedRepo .BaseRepo.ID}}{{.SignedUser.Name}}:{{end}}{{end}}{{.BranchName}}">
|
||||
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{.Repository.Owner.Name}}:{{.BranchName}}">
|
||||
<button class="ui green tiny compact button"><i class="octicon octicon-git-compare"></i></button>
|
||||
</a>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue