From 7be48d8d14c74dfb10ba3d71f12a78505daf29a6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Wed, 30 Sep 2015 12:00:35 -0400
Subject: [PATCH] Merge pull request #929 from willyann/develop
---
src/test/config/test-gitblit.properties | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index f16f5c5..398047c 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -1,20 +1,26 @@
#
# Gitblit Unit Testing properties
#
-
+git.allowAnonymousPushes = true
+git.defaultAccessRestriction = NONE
git.repositoriesFolder = ${baseFolder}/git
git.searchRepositoriesSubfolders = true
git.enableGitServlet = true
-groovy.scriptsFolder = ${baseFolder}/groovy
+git.daemonPort = 8300
+git.sshPort = 29418
+git.sshKeysManager = com.gitblit.transport.ssh.MemoryKeyManager
+git.sshWithKrb5 = true
+git.sshAuthenticatorsOrder = password, publickey,gssapi-with-mic,invalid
+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 = 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
@@ -47,7 +53,7 @@
web.itemsPerPage = 50
web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb
web.markdownExtensions = md mkd markdown MD MKD
-web.imageExtensions = bmp jpg gif png
+web.imageExtensions = bmp jpg jpeg gif png ico
web.binaryExtensions = jar pdf tar.gz zip
web.aggressiveHeapManagement = false
web.debugMode = false
--
Gitblit v1.9.1