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] 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 c1ec61ba6e..965a401089 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>