From 0c5cee25a1d9019de2d92427fda886a28076aa01 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 18 Sep 2013 11:31:02 -0400
Subject: [PATCH] Disable but improve the example commit message regexes
---
src/main/java/com/gitblit/Constants.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 0514045..bd04128 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -43,8 +43,12 @@
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";
+
+ public static final String DEFAULT_USER_REPOSITORY_PREFIX = "~";
public static final String GIT_PATH = "/git/";
@@ -59,6 +63,8 @@
public static final String PAGES = "/pages/";
public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
+
+ public static final String BRANCH_GRAPH_PATH = "/graph/";
public static final String BORDER = "***********************************************************";
@@ -80,13 +86,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();
@@ -305,7 +325,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,
@@ -464,12 +484,25 @@
}
public static enum AccountType {
- LOCAL, LDAP, REDMINE;
+ LOCAL, EXTERNAL, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
public boolean isLocal() {
return this == LOCAL;
}
}
+
+ public static enum CommitMessageRenderer {
+ PLAIN, MARKDOWN;
+
+ public static CommitMessageRenderer fromName(String name) {
+ for (CommitMessageRenderer renderer : values()) {
+ if (renderer.name().equalsIgnoreCase(name)) {
+ return renderer;
+ }
+ }
+ return CommitMessageRenderer.PLAIN;
+ }
+ }
@Documented
@Retention(RetentionPolicy.RUNTIME)
--
Gitblit v1.9.1