* Use correct index when fetching commit status Signed-off-by: Elias Norberg <elias@aisle.se> * Compare against base repo to avoid mismatch when merging from fork Signed-off-by: Elias Norberg <elias@aisle.se> * Fix pull request commit status in user dashboard listtags/v1.9.4
@@ -339,14 +339,17 @@ func (pr *PullRequest) GetLastCommitStatus() (status *CommitStatus, err error) { | |||
return nil, err | |||
} | |||
repo := pr.HeadRepo | |||
lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch) | |||
if err != nil { | |||
return nil, err | |||
} | |||
var statusList []*CommitStatus | |||
statusList, err = GetLatestCommitStatus(repo, lastCommitID, 0) | |||
err = pr.GetBaseRepo() | |||
if err != nil { | |||
return nil, err | |||
} | |||
statusList, err := GetLatestCommitStatus(pr.BaseRepo, lastCommitID, 0) | |||
if err != nil { | |||
return nil, err | |||
} |
@@ -212,8 +212,8 @@ | |||
<a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a> | |||
{{if .IsPull }} | |||
{{if (index $.CommitStatus .ID)}} | |||
{{template "repo/commit_status" (index $.CommitStatus .ID)}} | |||
{{if (index $.CommitStatus .PullRequest.ID)}} | |||
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} | |||
{{end}} | |||
{{end}} | |||
@@ -68,8 +68,8 @@ | |||
<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a> | |||
{{if .IsPull }} | |||
{{if (index $.CommitStatus .ID)}} | |||
{{template "repo/commit_status" (index $.CommitStatus .ID)}} | |||
{{if (index $.CommitStatus .PullRequest.ID)}} | |||
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} | |||
{{end}} | |||
{{end}} | |||