diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html index 9b0f386..8a9a4cc 100644 --- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html @@ -4,33 +4,42 @@ @import context._ @import gitbucket.core.view.helpers._ @import gitbucket.core.model._ -
+
@commits.map { day => -
- Commits on @date(day.head.commitTime) +
+ 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) -
+
+ @day.map { commit => +
+ +
+
@avatar(commit, 40)
+
+ @link(commit.summary, repository) + @if(commit.description.isDefined){ + ... + } +
+ @if(commit.description.isDefined){ + + } +
+ @user(commit.authorName, commit.authorEmailAddress, "username") + authored @helper.html.datetimeago(commit.authorTime) + @if(commit.isDifferentFromAuthor) { + + @user(commit.committerName, commit.committerEmailAddress, "username") + committed @helper.html.datetimeago(commit.authorTime) + } +
+
+
+
+ } +
}
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index ca72073..f9965ca 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -131,7 +131,39 @@
+
+ @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) +
+ } +
+ @* @pulls.html.commits(commits, Some(comments), repository) + *@ @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true, None, hasForkedWritePermission, false)

Showing you all comments on commits in this comparison.

@issues.html.commentlist(None, comments, hasForkedWritePermission, repository, None)