Merge with 2.0.0-m3

This commit is contained in:
René Pfeuffer
2018-08-30 10:04:06 +02:00
28 changed files with 683 additions and 244 deletions

View File

@@ -203,9 +203,9 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
boolean hasPermission = false;
for (sonia.scm.repository.Permission permission : repositoryPermissions)
{
if (isUserPermitted(user, groups, permission))
hasPermission = isUserPermitted(user, groups, permission);
if (hasPermission)
{
String perm = permission.getType().getPermissionPrefix().concat(repository.getId());
if (logger.isTraceEnabled())
{