From c53521f1f200a4f12e12c907625c974a0235c805 Mon Sep 17 00:00:00 2001
From: Elias Norberg <elias@aisle.se>
Date: Sun, 29 Sep 2019 18:43:06 +0200
Subject: [PATCH 1/3] Use correct index when fetching commit status

Signed-off-by: Elias Norberg <elias@aisle.se>
---
 templates/repo/issue/list.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 3007c991061e4..ac32a8d71ea3e 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -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}}
 

From bb46e7fbeb4e6f9d7d1c5304b6a7813a8a6dd7ab Mon Sep 17 00:00:00 2001
From: Elias Norberg <elias@aisle.se>
Date: Sun, 29 Sep 2019 18:45:13 +0200
Subject: [PATCH 2/3] Compare against base repo to avoid mismatch when merging
 from fork

Signed-off-by: Elias Norberg <elias@aisle.se>
---
 models/pull.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/pull.go b/models/pull.go
index 3f890881923be..13518dd1c391d 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -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
 	}

From db0b52a7458bf6f0a9d2a0979d7523463d6df519 Mon Sep 17 00:00:00 2001
From: Elias Norberg <elias@aisle.se>
Date: Mon, 30 Sep 2019 10:27:14 +0200
Subject: [PATCH 3/3] Fix pull request commit status in user dashboard list

---
 templates/user/dashboard/issues.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index b69509d7992c1..deb6ec65120bf 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -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}}