From 684cfd65840762029472b826bde317be951c2c08 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 20 Jun 2013 17:42:24 -0400 Subject: [PATCH] Display full message on commitdiff page (issue-258) --- releases.moxie | 1 + .../com/gitblit/wicket/pages/CommitDiffPage.html | 13 +++++++------ .../com/gitblit/wicket/pages/CommitDiffPage.java | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/releases.moxie b/releases.moxie index 6091daf4..8ac0c491 100644 --- a/releases.moxie +++ b/releases.moxie @@ -36,6 +36,7 @@ r17: { changes: - Improved error logging for servlet containers which provide a null contextFolder (issue 199) - Improve Gerrit change ref decoration in the refs panel (issue 206) + - Display full commit message on commitdiff page (issue-258) - Improved the repository url display. This display now indicates your repository access permission, per-protocol. - Automatically encode/decode usernames for urls using %XX notation on space, @, and \ - Disable Gson's pretty printing which has a huge performance gain diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html index de39f4ca..11a0ce3e 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html @@ -15,13 +15,14 @@
[commit header]
- -
- -
+ +
[commit message]
+ + +
-
[changed files]
-
+ +
[changed files]
diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java index ee2aaa2b..6954808d 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java @@ -16,6 +16,7 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.wicket.PageParameters; @@ -29,9 +30,11 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.PathModel.PathChangeModel; +import com.gitblit.models.GitNote; import com.gitblit.models.SubmoduleModel; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.DiffUtils.DiffOutputType; @@ -39,7 +42,9 @@ import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.CommitLegendPanel; +import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; +import com.gitblit.wicket.panels.RefsPanel; public class CommitDiffPage extends RepositoryPage { @@ -76,6 +81,8 @@ public class CommitDiffPage extends RepositoryPage { add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); + addFullText("fullMessage", commit.getFullMessage(), true); + // changed paths list List paths = JGitUtils.getFilesInCommit(r, commit); -- 2.39.5