From d69d73e5da5a12f279d5c0c38c871801739f33d6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:31:56 -0400
Subject: [PATCH] Switch to -u from deprecated --set-upstream
---
src/test/config/test-gitblit.properties | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index f16f5c5..1a52eaf 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -1,20 +1,24 @@
#
# 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
+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
--
Gitblit v1.9.1