From 034e4bc7cd5ca3271e59ebdba1b25beb37b4b73c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 May 2013 07:39:01 -0400
Subject: [PATCH] Enabled SparkleShare client menu using 1.1.0 invite handler redesign
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 8a233ea..94adf56 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -166,7 +166,8 @@
} else {
pages.put("summary", new PageRegistration("gb.summary", SummaryPage.class, params));
// pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
- }
+ pages.put("pushes", new PageRegistration("gb.pushes", PushesPage.class, params));
+ }
pages.put("commits", new PageRegistration("gb.commits", LogPage.class, params));
pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params));
pages.put("compare", new PageRegistration("gb.compare", ComparePage.class, params));
@@ -339,7 +340,7 @@
return commit;
}
- private Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {
+ protected Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {
if (submodules == null) {
submodules = new HashMap<String, SubmoduleModel>();
for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {
@@ -350,7 +351,10 @@
}
protected SubmoduleModel getSubmodule(String path) {
- SubmoduleModel model = submodules.get(path);
+ SubmoduleModel model = null;
+ if (submodules != null) {
+ model = submodules.get(path);
+ }
if (model == null) {
// undefined submodule?!
model = new SubmoduleModel(path.substring(path.lastIndexOf('/') + 1), path, path);
--
Gitblit v1.9.1