From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/test/config/test-gitblit.properties | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index 0d797b4..78e9ab9 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -6,13 +6,16 @@
git.repositoriesFolder = ${baseFolder}/git
git.searchRepositoriesSubfolders = true
git.enableGitServlet = true
+git.daemonPort = 8300
+git.sshPort = 29418
+git.sshKeysManager = com.gitblit.transport.ssh.MemoryKeyManager
groovy.scriptsFolder = src/main/distrib/data/groovy
groovy.preReceiveScripts = blockpush
groovy.postReceiveScripts = sendmail
web.authenticateViewPages = false
web.authenticateAdminPages = true
web.allowCookieAuthentication = true
-realm.userService = ${baseFolder}/src/test/config/test-users.conf
+realm.userService = src/test/config/test-users.conf
realm.passwordStorage = md5
realm.minPasswordLength = 5
web.siteName = Test Gitblit
@@ -48,7 +51,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