From ab07d0d86d8b64b4f7c88b45bc81f1eec22105db Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Preserve key index when re-adding an existing key
---
src/main/java/com/gitblit/Constants.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 1451ccf..56dfec0 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -52,6 +52,8 @@
public static final String DEFAULT_USER_REPOSITORY_PREFIX = "~";
+ public static final String R_PATH = "/r/";
+
public static final String GIT_PATH = "/git/";
public static final String ZIP_PATH = "/zip/";
@@ -68,7 +70,9 @@
public static final String BRANCH_GRAPH_PATH = "/graph/";
- public static final String BORDER = "***********************************************************";
+ public static final String BORDER = "*****************************************************************";
+
+ public static final String BORDER2 = "#################################################################";
public static final String FEDERATION_USER = "$gitblit";
@@ -96,7 +100,7 @@
public static final String HEAD = "HEAD";
- public static final String R_GITBLIT = "refs/gitblit/";
+ public static final String R_META = "refs/meta/";
public static final String R_HEADS = "refs/heads/";
@@ -104,11 +108,17 @@
public static final String R_CHANGES = "refs/changes/";
- public static final String R_PULL= "refs/pull/";
+ 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 final String R_FOR = "refs/for/";
+
+ public static final String R_TICKET = "refs/heads/ticket/";
+
+ public static final String R_TICKETS_PATCHSETS = "refs/tickets/";
public static String getVersion() {
String v = Constants.class.getPackage().getImplementationVersion();
@@ -340,7 +350,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, GET_USER, LIST_SETTINGS,
+ CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, 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,
@@ -395,7 +405,7 @@
public static enum SearchObjectType {
commit, blob;
- static SearchObjectType fromName(String name) {
+ public static SearchObjectType fromName(String name) {
for (SearchObjectType value : values()) {
if (value.name().equals(name)) {
return value;
@@ -491,7 +501,7 @@
}
public static enum AuthenticationType {
- CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER;
+ PUBLIC_KEY, CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER;
public boolean isStandard() {
return ordinal() <= COOKIE.ordinal();
@@ -499,7 +509,16 @@
}
public static enum AccountType {
- LOCAL, EXTERNAL, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
+ LOCAL, EXTERNAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
+
+ public static AccountType fromString(String value) {
+ for (AccountType type : AccountType.values()) {
+ if (type.name().equalsIgnoreCase(value)) {
+ return type;
+ }
+ }
+ return AccountType.LOCAL;
+ }
public boolean isLocal() {
return this == LOCAL;
--
Gitblit v1.9.1