diff options
| author | Unknwon <u@gogs.io> | 2016-03-11 17:51:17 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-03-11 17:51:17 -0500 |
| commit | 6530375dbf919c401ad7be6b733884347148afbb (patch) | |
| tree | 0bd735adebe192cdf8099a6ab62d488257f40022 | |
| parent | 449a6e490bb5fed0ff8168735d8dc21dd1c04a95 (diff) | |
| parent | 1d3ec27cb74b9a94a9c337fea633302e3e3e2ff8 (diff) | |
| download | gitea-6530375dbf919c401ad7be6b733884347148afbb.tar.gz gitea-6530375dbf919c401ad7be6b733884347148afbb.zip | |
Merge pull request #2761 from soudy/grey-out-merge-commit
Grey out merge commits
| -rw-r--r-- | templates/repo/commits_table.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index e13cc21089..965a401089 100644 --- 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=""/> {{.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> |