From 538991e465c7a3badceb5629c3410e16cc900778 Mon Sep 17 00:00:00 2001
From: Koen Serry <koen@serry.org>
Date: Sun, 03 Aug 2014 04:50:14 -0400
Subject: [PATCH] Allow gitblit baseFolder to be defined by a system property
---
src/main/java/com/gitblit/Constants.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 2007c0a..3e30753 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -122,6 +122,14 @@
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 String getVersion() {
String v = Constants.class.getPackage().getImplementationVersion();
if (v == null) {
@@ -405,11 +413,11 @@
/**
* Enumeration of the feed content object types.
*/
- public static enum FeedContentObjectType {
+ public static enum FeedObjectType {
COMMIT, TAG;
- public static FeedContentObjectType forName(String name) {
- for (FeedContentObjectType type : values()) {
+ public static FeedObjectType forName(String name) {
+ for (FeedObjectType type : values()) {
if (type.name().equalsIgnoreCase(name)) {
return type;
}
--
Gitblit v1.9.1