From df75fa3a0961fc6a539209d5f13788d64b109a34 Mon Sep 17 00:00:00 2001
From: Florian Zschocke <florian.zschocke@cycos.com>
Date: Mon, 26 Aug 2013 06:30:53 -0400
Subject: [PATCH] Add new configuration setting 'git.userRepositoryPrefix'.
---
src/main/java/com/gitblit/Constants.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 5bd5b60..2c67bff 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -43,6 +43,8 @@
public static final String NOT_FEDERATED_ROLE = "#notfederated";
public static final String NO_ROLE = "#none";
+
+ public static final String EXTERNAL_ACCOUNT = "#externalAccount";
public static final String PROPERTIES_FILE = "gitblit.properties";
@@ -56,7 +58,9 @@
public static final String RPC_PATH = "/rpc/";
- public static final String PAGES= "/pages/";
+ public static final String PAGES = "/pages/";
+
+ public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
public static final String BORDER = "***********************************************************";
@@ -78,13 +82,27 @@
public static final String ISO8601 = "yyyy-MM-dd'T'HH:mm:ssZ";
- public static final String R_GITBLIT = "refs/gitblit/";
-
public static final String baseFolder = "baseFolder";
public static final String baseFolder$ = "${" + baseFolder + "}";
public static final String contextFolder$ = "${contextFolder}";
+
+ public static final String HEAD = "HEAD";
+
+ public static final String R_GITBLIT = "refs/gitblit/";
+
+ public static final String R_HEADS = "refs/heads/";
+
+ public static final String R_NOTES = "refs/notes/";
+
+ public static final String R_CHANGES = "refs/changes/";
+
+ public static final String R_PULL= "refs/pull/";
+
+ public static final String R_TAGS = "refs/tags/";
+
+ public static final String R_REMOTES = "refs/remotes/";
public static String getVersion() {
String v = Constants.class.getPackage().getImplementationVersion();
@@ -303,7 +321,7 @@
public static enum RpcRequest {
// Order is important here. anything above LIST_SETTINGS requires
// administrator privileges and web.allowRpcManagement.
- CLEAR_REPOSITORY_CACHE, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, LIST_SETTINGS,
+ CLEAR_REPOSITORY_CACHE, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS,
CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY,
LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER,
LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM,
@@ -383,7 +401,11 @@
private AccessPermission(String code) {
this.code = code;
}
-
+
+ public boolean atMost(AccessPermission perm) {
+ return ordinal() <= perm.ordinal();
+ }
+
public boolean atLeast(AccessPermission perm) {
return ordinal() >= perm.ordinal();
}
@@ -458,7 +480,7 @@
}
public static enum AccountType {
- LOCAL, LDAP, REDMINE;
+ LOCAL, EXTERNAL, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
public boolean isLocal() {
return this == LOCAL;
--
Gitblit v1.9.1