Merge branch 'ticket/185' into develop

James Moger

2014-09-24 2fb843db2702f5f6d1df784d53dd6cbba286f4f3

Merge branch 'ticket/185' into develop

 src/main/java/com/gitblit/servlet/GitblitContext.java

@@ -340,9 +340,9 @@
            logger.error("");
        }

        String baseFromJndi = lookupBaseFolderFromJndi();
        if (!StringUtils.isEmpty(baseFromJndi)) {
            path = baseFromJndi;
        String externalBase = System.getProperty("GITBLIT_HOME", lookupBaseFolderFromJndi());
        if (!StringUtils.isEmpty(externalBase)) {
            path = externalBase;
        }

        File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);