From 97d3afed7f416bc3c0740b05974949ea38520c7e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 28 Dec 2011 20:09:46 -0500 Subject: [PATCH] Manager support for hook script inheritance --- src/com/gitblit/RpcServlet.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/RpcServlet.java b/src/com/gitblit/RpcServlet.java index c33bd8a..2d51388 100644 --- a/src/com/gitblit/RpcServlet.java +++ b/src/com/gitblit/RpcServlet.java @@ -276,7 +276,7 @@ } } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) { // return the server's settings - ServerSettings settings = GitBlit.self().getSettingsModel(); + ServerSettings settings = GitBlit.self().getSettingsModel(); if (allowAdmin) { // return all settings result = settings; @@ -294,12 +294,12 @@ keys.add(Keys.federation.sets); } // build the settings - ServerSettings managementSettings = new ServerSettings(); + ServerSettings managementSettings = new ServerSettings(); for (String key : keys) { managementSettings.add(settings.get(key)); } if (allowManagement) { - settings.pushScripts = settings.pushScripts; + managementSettings.pushScripts = settings.pushScripts; } result = managementSettings; } -- Gitblit v1.9.1