From 5ae529ea8a73edc8e2bb1e7f9576e51c9d870224 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Change IGitblit API to be more distinct from IUserService
---
src/main/java/com/gitblit/service/FederationPullService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/service/FederationPullService.java b/src/main/java/com/gitblit/service/FederationPullService.java
index c804f3f..e2a50f2 100644
--- a/src/main/java/com/gitblit/service/FederationPullService.java
+++ b/src/main/java/com/gitblit/service/FederationPullService.java
@@ -31,8 +31,8 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.FederationPullStatus;
import com.gitblit.Constants.FederationStrategy;
-import com.gitblit.GitBlitException.ForbiddenException;
import com.gitblit.GitBlit;
+import com.gitblit.GitBlitException.ForbiddenException;
import com.gitblit.IUserService;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
@@ -346,7 +346,7 @@
UserModel localUser = gitblit.getUserModel(user.username);
if (localUser == null) {
// create new local user
- gitblit.updateUserModel(user.username, user, true);
+ gitblit.addUser(user);
} else {
// update repository permissions of local user
if (user.permissions != null) {
@@ -363,7 +363,7 @@
}
localUser.password = user.password;
localUser.canAdmin = user.canAdmin;
- gitblit.updateUserModel(localUser.username, localUser, false);
+ gitblit.reviseUser(localUser.username, localUser);
}
for (String teamname : gitblit.getAllTeamNames()) {
--
Gitblit v1.9.1