Merge branch 'ticket/141' into develop

James Moger

2014-09-04 969656cd8f417378d9840a246dca698ff8d16551

Merge branch 'ticket/141' into develop

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

@@ -168,7 +168,7 @@
            // if the base folder dosen't match the default assume they don't want to use express,
            // this allows for other containers to customise the basefolder per context.
            String defaultBase = Constants.contextFolder$ + "/WEB-INF/data";
            String base = lookupBaseFolderFromJndi();
            String base = System.getProperty("GITBLIT_HOME",lookupBaseFolderFromJndi());
            if (!StringUtils.isEmpty(System.getenv("OPENSHIFT_DATA_DIR")) && defaultBase.equals(base)) {
                // RedHat OpenShift
                baseFolder = configureExpress(context, webxmlSettings, contextFolder, runtimeSettings);