diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
| commit | 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c (patch) | |
| tree | 4bdb208cede00e637ce4704d942aa045f5af5ed9 /src/main/java/com/gitblit/Constants.java | |
| parent | 07eb0963cae3a403f8774f65afa20c940ce7124f (diff) | |
| parent | 9b575e8fac8d5e17e77cc284092abd856ddec8ac (diff) | |
| download | gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.tar.gz gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.zip | |
Merge release 1.6.0
Diffstat (limited to 'src/main/java/com/gitblit/Constants.java')
| -rw-r--r-- | src/main/java/com/gitblit/Constants.java | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index e4d92e1a..3e307537 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -68,6 +68,8 @@ public class Constants { public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
+ public static final String RAW_PATH = "/raw/";
+
public static final String BRANCH_GRAPH_PATH = "/graph/";
public static final String BORDER = "*****************************************************************";
@@ -120,6 +122,14 @@ public class Constants { 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) {
@@ -348,9 +358,10 @@ public class Constants { * a client.
*/
public static enum RpcRequest {
- // Order is important here. anything above LIST_SETTINGS requires
+ // Order is important here. anything after LIST_SETTINGS requires
// administrator privileges and web.allowRpcManagement.
- CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS,
+ CLEAR_REPOSITORY_CACHE, REINDEX_TICKETS, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER,
+ FORK_REPOSITORY, LIST_SETTINGS,
CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY,
LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER,
LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM,
@@ -400,6 +411,27 @@ public class Constants { }
/**
+ * Enumeration of the feed content object types.
+ */
+ public static enum FeedObjectType {
+ COMMIT, TAG;
+
+ public static FeedObjectType forName(String name) {
+ for (FeedObjectType type : values()) {
+ if (type.name().equalsIgnoreCase(name)) {
+ return type;
+ }
+ }
+ return COMMIT;
+ }
+
+ @Override
+ public String toString() {
+ return name().toLowerCase();
+ }
+ }
+
+ /**
* The types of objects that can be indexed and queried.
*/
public static enum SearchObjectType {
|