summaryrefslogtreecommitdiffstats
path: root/templates/repo/commits_table.tmpl
diff options
context:
space:
mode:
authorSteven Oud <soud@protonmail.com>2016-03-05 17:00:38 +0100
committerSteven Oud <soud@protonmail.com>2016-03-05 17:00:38 +0100
commita0cd59bd0e3fe1e67314c0562274778802d3383d (patch)
tree6d2ee6f3445438c72843fdb8237f80563c0c2233 /templates/repo/commits_table.tmpl
parenta2f13eae559c71d35662b7767a8b8347a26eb53e (diff)
downloadgitea-a0cd59bd0e3fe1e67314c0562274778802d3383d.tar.gz
gitea-a0cd59bd0e3fe1e67314c0562274778802d3383d.zip
Grey out merge commits
Diffstat (limited to 'templates/repo/commits_table.tmpl')
-rw-r--r--templates/repo/commits_table.tmpl5
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index e13cc21089..c1ec61ba6e 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>