merge with 2.0.0-m3 branch

This commit is contained in:
Sebastian Sdorra
2018-08-30 11:28:26 +02:00
72 changed files with 3308 additions and 437 deletions

View File

@@ -207,9 +207,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())
{