From 35bb2253c9ff0dcc44f3245026a141fde6415153 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 19:03:46 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges

---
 src/test/java/com/gitblit/tests/BranchTicketServiceTest.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/gitblit/tests/BranchTicketServiceTest.java b/src/test/java/com/gitblit/tests/BranchTicketServiceTest.java
index 6119b8d..cc404ab 100644
--- a/src/test/java/com/gitblit/tests/BranchTicketServiceTest.java
+++ b/src/test/java/com/gitblit/tests/BranchTicketServiceTest.java
@@ -54,8 +54,8 @@
 		IRuntimeManager runtimeManager = new RuntimeManager(settings).start();
 		IPluginManager pluginManager = new PluginManager(runtimeManager).start();
 		INotificationManager notificationManager = new NotificationManager(settings).start();
-		IUserManager userManager = new UserManager(runtimeManager).start();
-		IRepositoryManager repositoryManager = new RepositoryManager(runtimeManager, userManager).start();
+		IUserManager userManager = new UserManager(runtimeManager, pluginManager).start();
+		IRepositoryManager repositoryManager = new RepositoryManager(runtimeManager, pluginManager, userManager).start();
 
 		BranchTicketService service = new BranchTicketService(
 				runtimeManager,

--
Gitblit v1.9.1