From 2e8c48c0048e386431d5c41cea733b6d95760d52 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 03 Dec 2012 17:05:49 -0500
Subject: [PATCH] Update to Jetty 7.6.8
---
src/com/gitblit/FileUserService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index d411b68..056df82 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -329,8 +329,7 @@
UserModel oldUser = getUserModel(username);
List<String> roles;
if (model.permissions == null) {
- // legacy, use repository list
- roles = new ArrayList<String>(model.repositories);
+ roles = new ArrayList<String>();
} else {
// discrete repository permissions
roles = new ArrayList<String>();
@@ -797,7 +796,10 @@
repositories.add(role);
}
}
- team.addRepositoryPermissions(repositories);
+ if (!team.canAdmin) {
+ // only read permissions for non-admin teams
+ team.addRepositoryPermissions(repositories);
+ }
team.addUsers(users);
team.addMailingLists(mailingLists);
team.preReceiveScripts.addAll(preReceive);
--
Gitblit v1.9.1