diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html index 43ed945..6861991 100644 --- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html @@ -4,7 +4,37 @@ @import context._ @import gitbucket.core.view.helpers._ @import gitbucket.core.model._ -
+
+ @commits.map { day => +
+ Commits on @date(day.head.commitTime) +
+ + @day.map { commit => + + + + @* + @if(comments.isDefined){ + @comments.get.flatMap @{ + case comment: CommitComment => Some(comment) + case other => None + }.count(t => t.commitId == commit.id && !t.pullRequest) + } + *@ + + + } +
+ + @avatar(commit, 20) + @user(commit.authorName, commit.authorEmailAddress, "username strong") + @commit.shortMessage + @commit.id.substring(0, 7) +
+ } + + @* @commits.map { day => @@ -32,4 +62,5 @@ } }
+ *@
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 2b728fd..0bae885 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -49,35 +49,35 @@ Create pull request