From a0cd59bd0e3fe1e67314c0562274778802d3383d Mon Sep 17 00:00:00 2001
From: Steven Oud <soud@protonmail.com>
Date: Sat, 5 Mar 2016 17:00:38 +0100
Subject: [PATCH 1/2] Grey out merge commits

---
 templates/repo/commits_table.tmpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index e13cc2108..c1ec61ba6 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -35,7 +35,12 @@
 								<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}}
 							{{end}}
 						</td>
+
+						{{if gt .ParentCount 1}}
+						<td class="message collapsing has-emoji grey text">
+						{{else}}
 						<td class="message collapsing has-emoji">
+						{{end}}
 							<a rel="nofollow" class="ui sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a>
 							{{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}}
 						</td>

From 1d3ec27cb74b9a94a9c337fea633302e3e3e2ff8 Mon Sep 17 00:00:00 2001
From: Steven Oud <soud@protonmail.com>
Date: Sat, 5 Mar 2016 17:59:07 +0100
Subject: [PATCH 2/2] Put if statement of grey merge commits on one line

---
 templates/repo/commits_table.tmpl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index c1ec61ba6..965a40108 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -36,11 +36,8 @@
 							{{end}}
 						</td>
 
-						{{if gt .ParentCount 1}}
-						<td class="message collapsing has-emoji grey text">
-						{{else}}
-						<td class="message collapsing has-emoji">
-						{{end}}
+
+						<td class="message collapsing has-emoji {{if gt .ParentCount 1}} grey text {{end}}">
 							<a rel="nofollow" class="ui sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a>
 							{{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}}
 						</td>