From 6a7496f40c0eca659d0ee1c4f4d9cee204d244d7 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 25 Jan 2017 09:17:41 -0500 Subject: Revert "New rpc endpoint for listing all branches from a given repository" --- src/main/java/com/gitblit/Constants.java | 2 +- src/main/java/com/gitblit/servlet/RpcServlet.java | 12 ------------ src/site/rpc.mkd | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java index cd379b34..ab503bd3 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -410,7 +410,7 @@ public class Constants { // 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, - FORK_REPOSITORY, LIST_REPOSITORY_BRANCHES, LIST_SETTINGS, + 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, diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index 025be440..9809a252 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -328,18 +328,6 @@ public class RpcServlet extends JsonServlet { Collection permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE); result = gitblit.setTeamAccessPermissions(model, permissions); - } else if (RpcRequest.LIST_REPOSITORY_BRANCHES.equals(reqType)) { - - // list all branches for the given repository - Repository repository = gitblit.getRepository(objectName); - List refs = JGitUtils.getLocalBranches(repository, false, -1); - - List branches = new ArrayList<>(); - for (RefModel ref : refs) { - branches.add(ref.getName()); - } - repository.close(); - result = branches; } else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) { // return the list of federation registrations if (allowAdmin) { diff --git a/src/site/rpc.mkd b/src/site/rpc.mkd index e04b0adc..4b065bf0 100644 --- a/src/site/rpc.mkd +++ b/src/site/rpc.mkd @@ -62,7 +62,6 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The Gitblit v1.3.16 Gitblit v1.4.07 Gitblit v1.6.08 -Gitblit v1.9.09 @@ -105,7 +104,6 @@ Use *SET_REPOSITORY_TEAM_PERMISSIONS* instead. SET_REPOSITORY_TEAMSrepository nameadmin2List<String>- LIST_REPOSITORY_TEAM_PERMISSIONSrepository nameadmin5-List<String> SET_REPOSITORY_TEAM_PERMISSIONSrepository nameadmin5List<String>- -LIST_REPOSITORY_BRANCHESrepository name-9-List<String> LIST_SETTINGS-admin1-ServerSettings (management keys) CLEAR_REPOSITORY_CACHE--4-- REINDEX_TICKETSrepository name-7-- -- cgit v1.2.3