Create default permissions on refs/for/* rather than on refs/for/refs/* "refs/for/*" and "refs/for/refs/*" are sementically equivalent. It may be confusing for people that are onboarding Gerrit to see default permissions on both "refs/for/*" and "refs/for/refs/*" as it will likely make them wonder what's the difference. Avoid this possible confusion and only create default permissions on "refs/for/*". Release-Notes: skip Change-Id: Idcf5c24d9fa1592f84dbc5b69fa2e79403032307 Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/java/com/google/gerrit/server/schema/AllProjectsCreator.java index c0194e4..189ed93 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/java/com/google/gerrit/server/schema/AllProjectsCreator.java
@@ -208,18 +208,16 @@ private void initDefaultAclsForRegisteredUsers( AccessSection.Builder heads, LabelType codeReviewLabel, ProjectConfig config) { - config.upsertAccessSection( - "refs/for/*", refsFor -> grant(config, refsFor, Permission.ADD_PATCH_SET, registered)); - grant(config, heads, codeReviewLabel, -1, 1, registered); grant(config, heads, Permission.FORGE_AUTHOR, registered); grant(config, heads, Permission.REVERT, registered); config.upsertAccessSection( - "refs/for/" + AccessSection.ALL, - magic -> { - grant(config, magic, Permission.PUSH, registered); - grant(config, magic, Permission.PUSH_MERGE, registered); + "refs/for/*", + refsFor -> { + grant(config, refsFor, Permission.ADD_PATCH_SET, registered); + grant(config, refsFor, Permission.PUSH, registered); + grant(config, refsFor, Permission.PUSH_MERGE, registered); }); }
diff --git a/java/com/google/gerrit/server/schema/testing/AllProjectsCreatorTestUtil.java b/java/com/google/gerrit/server/schema/testing/AllProjectsCreatorTestUtil.java index 3c26d3f..8d7759d 100644 --- a/java/com/google/gerrit/server/schema/testing/AllProjectsCreatorTestUtil.java +++ b/java/com/google/gerrit/server/schema/testing/AllProjectsCreatorTestUtil.java
@@ -57,7 +57,6 @@ " read = block group Blocked Users", "[access \"refs/for/*\"]", " addPatchSet = group Registered Users", - "[access \"refs/for/refs/*\"]", " push = group Registered Users", " pushMerge = group Registered Users", "[access \"refs/heads/*\"]",