From 51e21e040c65781cea10b54365e87fa8e0459737 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Oct 2011 19:12:00 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
src/com/gitblit/GitBlitServer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 5c8c5fe..1b079de 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -209,7 +209,7 @@
// Root WebApp Context
WebAppContext rootContext = new WebAppContext();
- rootContext.setContextPath("/");
+ rootContext.setContextPath(settings.getString(Keys.server.contextPath, "/"));
rootContext.setServer(server);
rootContext.setWar(location.toExternalForm());
rootContext.setTempDirectory(tempDir);
--
Gitblit v1.9.1