Merge "Add ability to deny uploading merge commits"

2011-04-07 19:15:02 -07:00
parent f5c473ea18 632060c4b9
commit 28c6ffab61
7 changed files with 80 additions and 5 deletions
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
@@ -205,7 +205,7 @@ public class SchemaCreatorTest extends TestCase {
    } finally {
      c.close();
    }
-    assertValueRange(ApprovalCategory.READ, -1, 1, 2);
+    assertValueRange(ApprovalCategory.READ, -1, 1, 2, 3);
  }

  public void testCreateSchema_ApprovalCategory_Submit() throws OrmException {