Merge changes from topic 'notedb-accounts-1'
* changes: AccountsUpdate: Rename atomicUpdate to update AccountsUpdate: Rename update method to replace Always update accounts atomically Migrate accounts to NoteDb (part 2) Disallow updates to account.config by direct push or submit Migrate accounts to NoteDb (part 1) Let AccountsUpdate#insert create the Account instance AccountsUpdate: Remove upsert method
This commit is contained in:
@@ -51,6 +51,7 @@ import java.util.TimeZone;
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Provider;
|
||||
import javax.inject.Singleton;
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.lib.CommitBuilder;
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
import org.eclipse.jgit.lib.ObjectId;
|
||||
@@ -107,7 +108,7 @@ public class PutMessage
|
||||
protected Response<String> applyImpl(
|
||||
BatchUpdate.Factory updateFactory, ChangeResource resource, Input input)
|
||||
throws IOException, UnchangedCommitMessageException, RestApiException, UpdateException,
|
||||
PermissionBackendException, OrmException {
|
||||
PermissionBackendException, OrmException, ConfigInvalidException {
|
||||
PatchSet ps = psUtil.current(db.get(), resource.getNotes());
|
||||
if (ps == null) {
|
||||
throw new ResourceConflictException("current revision is missing");
|
||||
|
||||
Reference in New Issue
Block a user