opendev/gerrit
Code Issues Proposed changes

Merge changes I2f26ff5d,I46993b48 into stable-3.3

Browse Source 
* changes:
  Fix flaky test for group renaming in ProjectConfig
  ProjectConfig: Write resolved groups to file
This commit is contained in:
Patrick Hiesel
2020-11-27 08:17:11 +00:00
committed by Gerrit Code Review
parent 34f8614cbc 0134ba4854
commit b74bd6dc2c
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/project/ProjectConfig.java
View File

@@ -1425,7 +1425,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
if (group.getUUID() != null) {
keepGroups.add(group.getUUID());
}
rules.add(rule.asString(needRange));
rules.add(rule.toBuilder().setGroup(group).build().asString(needRange));
}
rc.setStringList(CAPABILITY, null, permission.getName(), rules);
}
@@ -1470,7 +1470,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
if (group.getUUID() != null) {
keepGroups.add(group.getUUID());
}
rules.add(rule.asString(needRange));
rules.add(rule.toBuilder().setGroup(group).build().asString(needRange));
}
rc.setStringList(ACCESS, refName, permission.getName(), rules);
}