From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/test/config/test-gitblit.properties | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index f16f5c5..7876407 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -5,16 +5,16 @@
git.repositoriesFolder = ${baseFolder}/git
git.searchRepositoriesSubfolders = true
git.enableGitServlet = true
-groovy.scriptsFolder = ${baseFolder}/groovy
+groovy.scriptsFolder = src/main/distrib/data/groovy
groovy.preReceiveScripts = blockpush
groovy.postReceiveScripts = sendmail
web.authenticateViewPages = false
web.authenticateAdminPages = true
web.allowCookieAuthentication = true
-realm.userService = test-users.conf
+realm.userService = ${baseFolder}/src/test/config/test-users.conf
realm.passwordStorage = md5
realm.minPasswordLength = 5
-web.siteName =
+web.siteName = Test Gitblit
web.allowAdministration = true
web.enableRpcServlet = true
web.enableRpcManagement = true
--
Gitblit v1.9.1