Merge branch 'stable-2.10'

* stable-2.10:
  Remove 2.9.2 fix from 2.10 release notes
  Fix SubmoduleOp tests
  Fix quoted-printable encoding of e-mail addresses
  Fix incorrect submodule subscriptions
  Remove 'send email' checkbox from reply box on change screen
  Update system group documentation
  Consider rule action while constructing local owners list
  Increase the size of HTTP passwords
  Do not throw away random bytes from the CSPRNG

Change-Id: I915ebcdcc00028b79277e5213cd5618a07efe01a
This commit is contained in:
David Pursehouse
2014-11-26 18:39:22 +09:00
12 changed files with 183 additions and 84 deletions

View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.project;
import static com.google.gerrit.common.data.PermissionRule.Action.ALLOW;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Function;
@@ -140,7 +141,7 @@ public class ProjectState {
if (owner != null) {
for (PermissionRule rule : owner.getRules()) {
GroupReference ref = rule.getGroup();
if (ref.getUUID() != null) {
if (rule.getAction() == ALLOW && ref.getUUID() != null) {
groups.add(ref.getUUID());
}
}