Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix parent commit id presentation.

Browse Source
This commit is contained in:
takezoe
2013-06-19 21:07:38 +09:00
parent fac91a2832
commit 75851923e6
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/twirl/repo/commit.scala.html
View File

@@ -21,7 +21,8 @@
<tr> <tr>
<td> <td>
<a href="@path/@commit.committer" class="username">@commit.committer</a> <span class="description">@helpers.datetime(commit.time)</span> <a href="@path/@commit.committer" class="username">@commit.committer</a> <span class="description">@helpers.datetime(commit.time)</span>
<div class="pull-right align-right monospace small"> <div class="pull-right monospace small" style="text-align: right;">
<div>
@if(commit.parents.size == 0){ @if(commit.parents.size == 0){
<span class="description">0 parent</span> <span class="description">0 parent</span>
} }
@@ -30,12 +31,16 @@
<a href="@path/@repository.owner/@repository.name/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a> <a href="@path/@repository.owner/@repository.name/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a>
} }
<span class="description">commit</span> @commit.id <span class="description">commit</span> @commit.id
</div>
@if(commit.parents.size > 1){ @if(commit.parents.size > 1){
<br> <div>
<span class="description">@commit.parents.size parent</span> <span class="description">@commit.parents.size parents
@commit.parents.map { parent => @commit.parents.zipWithIndex.map { case (parent, i) =>
@parent @if(i != 0){ + }
}.mkString(" + ") <a href="@path/@repository.owner/@repository.name/commit/@parent" class="commit-id">@parent.substring(0, 7)</a>
}
</span>
</div>
} }
</div> </div>
</td> </td>