From 6e990e83ba918805cdd5831451f6120bff3f5897 Mon Sep 17 00:00:00 2001
From: larsmaes <lars.maes@gmail.com>
Date: Thu, 06 Nov 2014 11:17:40 -0500
Subject: [PATCH] Update GitBlitWebApp_nl.properties
---
src/main/java/com/gitblit/Constants.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 96f13c8..fa8af25 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -68,7 +68,7 @@
public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
- public static final String BRANCH = "/branch/";
+ public static final String RAW_PATH = "/raw/";
public static final String BRANCH_GRAPH_PATH = "/graph/";
@@ -121,6 +121,16 @@
public static final String R_TICKET = "refs/heads/ticket/";
public static final String R_TICKETS_PATCHSETS = "refs/tickets/";
+
+ public static final String R_MASTER = "refs/heads/master";
+
+ public static final String MASTER = "master";
+
+ public static final String R_DEVELOP = "refs/heads/develop";
+
+ public static final String DEVELOP = "develop";
+
+ public static final String AUTHENTICATION_TYPE = "authentication-type";
public static String getVersion() {
String v = Constants.class.getPackage().getImplementationVersion();
@@ -350,9 +360,10 @@
* a client.
*/
public static enum RpcRequest {
- // Order is important here. anything above LIST_SETTINGS requires
+ // Order is important here. anything after LIST_SETTINGS requires
// administrator privileges and web.allowRpcManagement.
- CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS,
+ CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER,
+ FORK_REPOSITORY, LIST_SETTINGS,
CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY,
LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER,
LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM,
@@ -388,6 +399,27 @@
public static SearchType forName(String name) {
for (SearchType type : values()) {
+ if (type.name().equalsIgnoreCase(name)) {
+ return type;
+ }
+ }
+ return COMMIT;
+ }
+
+ @Override
+ public String toString() {
+ return name().toLowerCase();
+ }
+ }
+
+ /**
+ * Enumeration of the feed content object types.
+ */
+ public static enum FeedObjectType {
+ COMMIT, TAG;
+
+ public static FeedObjectType forName(String name) {
+ for (FeedObjectType type : values()) {
if (type.name().equalsIgnoreCase(name)) {
return type;
}
@@ -556,7 +588,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