Generalize the commit list in the pull request.

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

View File

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

View File

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

View File

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