diff options
author | Tomas Ljunggren <tomas.ljunggren@tieto.com> | 2012-01-24 08:22:58 +0100 |
---|---|---|
committer | Tomas Ljunggren <tomas.ljunggren@tieto.com> | 2012-01-24 08:23:08 +0100 |
commit | 1ea397ea80dbaf52c7a6853cde1027bb02de19c1 (patch) | |
tree | a220127f18f45be0253b5ce2fc34990efc5540bd | |
parent | c514d8c4acefb6a13fc8db3476f9e140a478194e (diff) | |
parent | 7ec4e0de6cbde9c3d8dd2a291140e02b5eb2dea6 (diff) |
Merge remote-tracking branch 'origin/corrections/qtqainfra-348' into integration/v2.2.1
Change-Id: I8e946c408abf32ec117b91bdcb540b7688b1f63b
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java index 7f0b74a77f..36eddef87f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java @@ -198,10 +198,14 @@ public class ProjectConfig extends VersionedMetaData { p.setSubmitType(rc.getEnum(SUBMIT, null, KEY_ACTION, defaultSubmitAction)); p.setUseContentMerge(rc.getBoolean(SUBMIT, null, KEY_MERGE_CONTENT, false)); - + p.setIncludeOnlyMaxApproval(rc.getBoolean(CHERRY_PICK, INCLUDE_ONLY_MAX_APPROVALS, false)); p.setHideReviewedOn(rc.getBoolean(CHERRY_PICK, HIDE_REVIEWED_ON, false)); + for (String category : rc.getNames(CHERRY_PICK, CATEGORY_FOOTERS)) { + final boolean value = rc.getBoolean(CATEGORY_FOOTERS, category, true); + p.addHiddenFooter(category, value); + } accessSections = new HashMap<String, AccessSection>(); for (String refName : rc.getSubsections(ACCESS)) { if (isAccessSection(refName)) { @@ -214,16 +218,9 @@ public class ProjectConfig extends VersionedMetaData { } } } - for (String varName : rc.getNames(ACCESS, refName)) { if (isPermission(varName)) { Permission perm = as.getPermission(varName, true); - for (String category : rc.getNames(CHERRY_PICK, CATEGORY_FOOTERS)) { - final boolean value = rc.getBoolean(CATEGORY_FOOTERS, category, true); - p.addHiddenFooter(category, value); - } - - boolean useRange = perm.isLabel(); for (String ruleString : rc.getStringList(ACCESS, refName, varName)) { PermissionRule rule; |