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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index 7d8e9a7..398047c 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -8,7 +8,9 @@
 git.enableGitServlet = true
 git.daemonPort = 8300
 git.sshPort = 29418
-git.sshPublicKeyAuthenticator = com.gitblit.tests.BogusPublicKeyAuthenticator
+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
@@ -51,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