From 79494047b062069fd8e692152d29773a22877d76 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Sun, 7 May 2017 17:40:31 +0300
Subject: Show commit status icon in commits table (#1688)
* Show commit status icon in commits table
* Add comments
* Fix icons
* Few more places where commit table is displayed
* Change integration test to use goquery for parsing html
* Add integration tests for commit table and status icons
* Fix status to return lates status correctly on all databases
* Rewrote lates commit status selects
---
routers/repo/commit.go | 4 ++++
routers/repo/pull.go | 4 ++++
2 files changed, 8 insertions(+)
(limited to 'routers/repo')
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 62f55a52e3..22de2450f2 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -69,6 +69,7 @@ func Commits(ctx *context.Context) {
commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
+ commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["Commits"] = commits
ctx.Data["Username"] = ctx.Repo.Owner.Name
@@ -123,6 +124,7 @@ func SearchCommits(ctx *context.Context) {
commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
+ commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["Commits"] = commits
ctx.Data["Keyword"] = keyword
@@ -170,6 +172,7 @@ func FileHistory(ctx *context.Context) {
commits = renderIssueLinks(commits, ctx.Repo.RepoLink)
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
+ commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["Commits"] = commits
ctx.Data["Username"] = ctx.Repo.Owner.Name
@@ -281,6 +284,7 @@ func CompareDiff(ctx *context.Context) {
}
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
+ commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["CommitRepoLink"] = ctx.Repo.RepoLink
ctx.Data["Commits"] = commits
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 3629c1330e..b710e94207 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -293,6 +293,8 @@ func ViewPullCommits(ctx *context.Context) {
}
commits = models.ValidateCommitsWithEmails(commits)
+ commits = models.ParseCommitsWithSignature(commits)
+ commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["Commits"] = commits
ctx.Data["CommitCount"] = commits.Len()
@@ -576,6 +578,8 @@ func PrepareCompareDiff(
}
prInfo.Commits = models.ValidateCommitsWithEmails(prInfo.Commits)
+ prInfo.Commits = models.ParseCommitsWithSignature(prInfo.Commits)
+ prInfo.Commits = models.ParseCommitsWithStatus(prInfo.Commits, headRepo)
ctx.Data["Commits"] = prInfo.Commits
ctx.Data["CommitCount"] = prInfo.Commits.Len()
ctx.Data["Username"] = headUser.Name
--
cgit v1.2.3