From 1f4cc634ec72934d5f71131e91cf0ff8cdf7d9e5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Apr 2014 12:10:56 -0400 Subject: [PATCH] Remove unused/garbage artifact from an earlier merge --- src/main/java/com/gitblit/Constants.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index ee6de45..2a98b53 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -70,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"; @@ -98,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/"; @@ -106,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(); @@ -342,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, -- Gitblit v1.9.1