Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 11:36:05 +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

6
src/main/twirl/repo/files.scala.html
View File

@@ -27,8 +27,6 @@
<a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
@if(latestCommit.description.isDefined){
<a href="javascript:void(0)" onclick="$('#description-@latestCommit.id').toggle();" class="omit">...</a>
}
@if(latestCommit.description.isDefined){
<pre id="description-@latestCommit.id" class="commit-description" style="display: none;">@link(latestCommit.description.get, repository)</pre>
}
</th>
@@ -36,7 +34,7 @@
<tr>
<td colspan="4" class="latest-commit">
<div>
@avatar(latestCommit.mailAddress, 20)
@avatar(latestCommit, 20)
@user(latestCommit.committer, latestCommit.mailAddress, "username strong")
<span class="muted">@datetime(latestCommit.time)</span>
<div class="pull-right align-right monospace">
@@ -82,7 +80,7 @@
@readme.map { content =>
<div class="box">
<div class="box-header">README.md</div>
<div class="box-content">@markdown(content, repository, false, false, false)</div>
<div class="box-content">@markdown(content, repository, false, false)</div>
</div>
}
}