From 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 18:59:24 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges
---
src/test/java/com/gitblit/tests/AuthenticationManagerTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/AuthenticationManagerTest.java b/src/test/java/com/gitblit/tests/AuthenticationManagerTest.java
index 84a2b74..f1d2711 100644
--- a/src/test/java/com/gitblit/tests/AuthenticationManagerTest.java
+++ b/src/test/java/com/gitblit/tests/AuthenticationManagerTest.java
@@ -43,7 +43,7 @@
IAuthenticationManager newAuthenticationManager() {
RuntimeManager runtime = new RuntimeManager(getSettings(), GitBlitSuite.BASEFOLDER).start();
- users = new UserManager(runtime).start();
+ users = new UserManager(runtime, null).start();
AuthenticationManager auth = new AuthenticationManager(runtime, users).start();
return auth;
}
--
Gitblit v1.9.1