From e9901a8abfe347df172482b78fdf4b3b780615b1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 22 Sep 2013 04:19:41 +0900 Subject: [PATCH] Generalize the commit list in the pull request. --- src/main/twirl/pulls/commits.scala.html | 5 +---- src/main/twirl/pulls/compare.scala.html | 3 +++ src/main/twirl/pulls/pullreq.scala.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/twirl/pulls/commits.scala.html b/src/main/twirl/pulls/commits.scala.html index 0a883f47c..d8e3c3df9 100644 --- a/src/main/twirl/pulls/commits.scala.html +++ b/src/main/twirl/pulls/commits.scala.html @@ -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._ diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index 8b5493b7d..d523d2d1f 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -86,6 +86,7 @@ } else { + @*
@commits.map { day => @@ -107,6 +108,8 @@ }
+ *@ + @pulls.html.commits(commits, repository) @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true) } } diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index 1a879b4bf..1713ddf29 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -42,7 +42,7 @@ @pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl)
- @pulls.html.commits(issue, pullreq, dayByDayCommits, hasWritePermission, repository) + @pulls.html.commits(dayByDayCommits, repository)
@helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true)