From 94ef80069e978137edc74cb428d4d52cdedbae5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 23 Jan 2013 08:31:35 -0500
Subject: [PATCH] Merge branch 'fogbugz' of https://github.com/djschny/gitblit
---
src/com/gitblit/GitblitUserService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index db450cf..37f22b0 100644
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/com/gitblit/GitblitUserService.java
@@ -60,7 +60,7 @@
@Override
public void setup(IStoredSettings settings) {
- File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "users.conf");
+ File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
serviceImpl = createUserService(realmFile);
logger.info("GUS delegating to " + serviceImpl.toString());
}
--
Gitblit v1.9.1