Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-23 00:39:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into #33_match-by-email

Browse Source 
Conflicts:
	src/main/scala/util/JGitUtil.scala
	src/main/scala/view/helpers.scala
	src/main/twirl/repo/blob.scala.html
	src/main/twirl/repo/commit.scala.html
	src/main/twirl/repo/commits.scala.html
	src/main/twirl/repo/files.scala.html
This commit is contained in:
takezoe
2013-07-18 15:49:56 +09:00
parent 828688ddd0 323e25951f
commit 000afa1ed6
35 changed files with 546 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@
</tr>
<tr>
<td>
@avatar(commit.mailAddress, 20)
@avatar(commit, 20)
@user(commit.committer, commit.mailAddress, "username strong")
<span class="muted">@datetime(commit.time)</span>
<div class="pull-right monospace small" style="text-align: right;">