Merge pull request #2761 from soudy/grey-out-merge-commit

Grey out merge commits
2016-03-11 17:51:17 -05:00 · 2016-03-11 17:51:17 -05:00 · 6530375dbf
parent 449a6e490b 1d3ec27cb7
commit 6530375dbf
1 changed files with 3 additions and 1 deletions
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@ -35,7 +35,9 @@
 								<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}}
 							{{end}}
 						</td>
-						<td class="message collapsing has-emoji">
+
+
+						<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>