From b23b67c1cc0b2541580f23c9aec97c0b84a823f4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 21 Feb 2014 09:56:37 -0500 Subject: [PATCH] Select default/configured gc period in create/edit repository page --- src/main/java/com/gitblit/Constants.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index 1451ccf..d425cda 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"; @@ -395,7 +399,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; @@ -499,7 +503,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