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

Generalize the commit list in the pull request.

Browse Source
This commit is contained in:
takezoe
2013-09-22 04:19:41 +09:00
parent 4e63d64c13
commit e9901a8abf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/twirl/pulls/commits.scala.html
View File

@@ -1,7 +1,4 @@
@(issue: model.Issue, @(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
pullreq: model.PullRequest,
commits: Seq[Seq[util.JGitUtil.CommitInfo]],
hasWritePermission: Boolean,
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._

3
src/main/twirl/pulls/compare.scala.html
View File

@@ -86,6 +86,7 @@
</tr> </tr>
</table> </table>
} else { } else {
@*
<div class="box"> <div class="box">
<table class="table table-file-list" style="border: 1px solid silver;"> <table class="table table-file-list" style="border: 1px solid silver;">
@commits.map { day => @commits.map { day =>
@@ -107,6 +108,8 @@
} }
</table> </table>
</div> </div>
*@
@pulls.html.commits(commits, repository)
@helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true) @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true)
} }
} }

2
src/main/twirl/pulls/pullreq.scala.html
View File

@@ -42,7 +42,7 @@
@pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl) @pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl)
</div> </div>
<div class="tab-pane" id="commits"> <div class="tab-pane" id="commits">
@pulls.html.commits(issue, pullreq, dayByDayCommits, hasWritePermission, repository) @pulls.html.commits(dayByDayCommits, repository)
</div> </div>
<div class="tab-pane" id="files"> <div class="tab-pane" id="files">
@helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true) @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true)