Display full message on commitdiff page (issue-258)

diff --git a/releases.moxie b/releases.moxie
index 6091daf4ff1a52b1269531351d15bef95641b68e..8ac0c49192848205c083935dc4580d38c7796be5 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -36,6 +36,7 @@ r17: {
        changes:\r
         - Improved error logging for servlet containers which provide a null contextFolder (issue 199)\r
         - Improve Gerrit change ref decoration in the refs panel (issue 206)\r
+        - Display full commit message on commitdiff page (issue-258)\r
         - Improved the repository url display.  This display now indicates your repository access permission, per-protocol.\r
         - Automatically encode/decode usernames for urls using %XX notation on space, @, and \\r
         - Disable Gson's pretty printing which has a huge performance gain\r

diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html
index de39f4ca5b65cbd97362cd89ae30fe776534d5ce..11a0ce3e1afa76486827fc30d43b4d62fb69b26b 100644 (file)
--- 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 -->\r
        <div wicket:id="commitHeader">[commit header]</div>\r
 \r
-       <!-- changed paths -->\r
-       <div style="padding-top:15px;">\r
-               <!-- commit legend -->\r
-               <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>\r
+       <!-- full message -->\r
+       <pre style="border-style:none" "class="commit_message" wicket:id="fullMessage">[commit message]</pre>\r
+\r
+       <!-- commit legend -->\r
+       <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>\r
        \r
-               <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>\r
-       </div>\r
+       <!-- changed paths -->\r
+       <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>\r
        \r
        <table class="pretty">\r
                <tr wicket:id="changedPath">\r

diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
index ee2aaa2b566b09d758846fcb45e303b6f99e9eb7..6954808d70c37d3fe1167d4df89349a849e14ece 100644 (file)
--- 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<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);