From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 src/com/gitblit/IUserService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/com/gitblit/IUserService.java b/src/com/gitblit/IUserService.java
index 426d38c..a85c997 100644
--- a/src/com/gitblit/IUserService.java
+++ b/src/com/gitblit/IUserService.java
@@ -29,6 +29,16 @@
 public interface IUserService {
 
 	/**
+	 * Setup the user service. This method allows custom implementations to
+	 * retrieve settings from gitblit.properties or the web.xml file without
+	 * relying on the GitBlit static singleton.
+	 * 
+	 * @param settings
+	 * @since 0.6.1
+	 */
+	void setup(IStoredSettings settings);
+
+	/**
 	 * Does the user service support cookie authentication?
 	 * 
 	 * @return true or false

--
Gitblit v1.9.1