Fix compare page exception when a submodule changes (issue-375)

diff --git a/releases.moxie b/releases.moxie
index 4825519c1116e0ebac15e540769bed82ac7f81f9..7bdd2f0b961236c3abe2a39cd670e44532c42079 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -23,6 +23,7 @@ r20: {
        - Fix chart failures when an apostrophe is in a user display name (issue-350, pr-128)
        - Fix exception in create repository when not selecting a garbage collection period (issue-366)
        - Stop setting admin permission based on undocumented Redmine REST API behavior (issue-368)
+       - Fix compage page failure when a submodule is changed in the commit range (issue-375)
        - Fix support url decoding with non-ascii characters (pr-136)
        - Fix potential NPE on removing uncached repository from cache
        - Ignore the default contents of .git/description file
@@ -123,6 +124,7 @@ r20: {
        - Berke Viktor
        - Vitaly Litvak
        - Matthias Cullman
+       - Eduardo Guervós Narvaez
 }
 
 #

diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
index d88c864aeae8b859a4e1eb91a907a35f8f6e919f..2024bf176c55e8fc773cc748f680cf84537da4db 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
@@ -171,6 +171,7 @@ public class ComparePage extends RepositoryPage {
                                                item.add(new ExternalLink("patch", "").setEnabled(false));
                                                item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
                                                                .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
+                                               item.add(new ExternalLink("raw", "").setEnabled(false));
                                                item.add(new ExternalLink("blame", "").setEnabled(false));
                                                item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                                                                .newPathParameter(repositoryName, endId, entry.path))