From 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 14:13:08 -0400
Subject: [PATCH] Merge branch 'master' into develop
---
src/main/java/com/gitblit/Constants.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index af53399..a5e76a5 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -68,6 +68,8 @@
public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
+ public static final String RAW_PATH = "/raw/";
+
public static final String BRANCH_GRAPH_PATH = "/graph/";
public static final String BORDER = "*****************************************************************";
@@ -554,7 +556,12 @@
}
public static Transport fromUrl(String url) {
- String scheme = url.substring(0, url.indexOf("://"));
+ int delim = url.indexOf("://");
+ if (delim == -1) {
+ // if no protocol is specified, SSH is assumed by git clients
+ return SSH;
+ }
+ String scheme = url.substring(0, delim);
return fromString(scheme);
}
}
--
Gitblit v1.9.1