diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-03 11:33:24 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-03 11:33:24 -0500 |
| commit | eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc (patch) | |
| tree | a87e6238a03f6e57e18166b73c0a69f2e20d6e8b | |
| parent | 1c2bff27ff37ec2add7c2badac46647fd92b71df (diff) | |
| download | gitblit-eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc.tar.gz gitblit-eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc.zip | |
Fix compare page exception when a submodule changes (issue-375)
| -rw-r--r-- | releases.moxie | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/ComparePage.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie index 4825519c..7bdd2f0b 100644 --- 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 d88c864a..2024bf17 100644 --- 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)) |