diff options
| author | James Moger <james.moger@gitblit.com> | 2012-01-13 08:16:40 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-01-13 08:16:40 -0500 |
| commit | 0256e6aa26ebb51416d290d772897caf84a1cd82 (patch) | |
| tree | 5d02047f0609eba2d041b962081f245c505ab557 /src/com/gitblit | |
| parent | 0f43a54527845b5873f35dc80300d578bfe84bb0 (diff) | |
| parent | 8051a29d8b3826772e5be1851eb72cd52ab5080c (diff) | |
| download | gitblit-0256e6aa26ebb51416d290d772897caf84a1cd82.tar.gz gitblit-0256e6aa26ebb51416d290d772897caf84a1cd82.zip | |
Merge branch 'master' into issues
Diffstat (limited to 'src/com/gitblit')
| -rw-r--r-- | src/com/gitblit/Constants.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/GitblitUserService.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index a28a871a..cedda6f4 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -29,11 +29,11 @@ public class Constants { // The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION = "0.9.0-SNAPSHOT";
+ public static final String VERSION = "0.8.2";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION_DATE = "PENDING";
+ public static final String VERSION_DATE = "2012-01-13";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java index eddc8a3d..7462af08 100644 --- a/src/com/gitblit/GitblitUserService.java +++ b/src/com/gitblit/GitblitUserService.java @@ -95,8 +95,8 @@ public class GitblitUserService implements IUserService { logger.info(MessageFormat.format("Automatically creating {0} based on {1}",
usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));
ConfigUserService configService = new ConfigUserService(usersConfig);
- for (String username : serviceImpl.getAllUsernames()) {
- UserModel userModel = serviceImpl.getUserModel(username);
+ for (String username : service.getAllUsernames()) {
+ UserModel userModel = service.getUserModel(username);
configService.updateUserModel(userModel);
}
}
|