diff --git a/Documentation/config-labels.txt b/Documentation/config-labels.txt index 67ebcf5c4e..fc25f22b3d 100644 --- a/Documentation/config-labels.txt +++ b/Documentation/config-labels.txt @@ -19,7 +19,7 @@ correct'. The range of values is: -* -2 Do not submit +* -2 This shall not be merged + The code is so horribly incorrect/buggy/broken that it must not be submitted to this project, or to this branch. This value is valid @@ -29,7 +29,7 @@ is submittable. + *Any -2 blocks submit.* -* -1 I would prefer that you didn't submit this +* -1 I would prefer this is not merged as is + The code doesn't look right, or could be done differently, but the reviewer is willing to live with it as-is if another reviewer diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt index ea714df231..8e7db2dc8f 100644 --- a/Documentation/rest-api-changes.txt +++ b/Documentation/rest-api-changes.txt @@ -518,8 +518,8 @@ describes the change. } ] "values": { - "-2": "Do not submit", - "-1": "I would prefer that you didn\u0027t submit this", + "-2": "This shall not be merged", + "-1": "I would prefer this is not merged as is", " 0": "No score", "+1": "Looks good to me, but someone else must approve", "+2": "Looks good to me, approved" @@ -1444,8 +1444,8 @@ for the current patch set. } ] "values": { - "-2": "Do not submit", - "-1": "I would prefer that you didn\u0027t submit this", + "-2": "This shall not be merged", + "-1": "I would prefer this is not merged as is", " 0": "No score", "+1": "Looks good to me, but someone else must approve", "+2": "Looks good to me, approved" diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java index 99ed71f265..f5925304c3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java @@ -213,8 +213,8 @@ public class AllProjectsCreator { new LabelValue((short) 2, "Looks good to me, approved"), new LabelValue((short) 1, "Looks good to me, but someone else must approve"), new LabelValue((short) 0, "No score"), - new LabelValue((short) -1, "I would prefer that you didn't submit this"), - new LabelValue((short) -2, "Do not submit"))); + new LabelValue((short) -1, "I would prefer this is not merged as is"), + new LabelValue((short) -2, "This shall not be merged"))); type.setAbbreviation("CR"); type.setCopyMinScore(true); c.getLabelSections().put(type.getName(), type); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/Util.java b/gerrit-server/src/test/java/com/google/gerrit/server/project/Util.java index f09f2d8982..d248c54f2a 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/project/Util.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/project/Util.java @@ -70,8 +70,8 @@ public class Util { value(2, "Looks good to me, approved"), value(1, "Looks good to me, but someone else must approve"), value(0, "No score"), - value(-1, "I would prefer that you didn't submit this"), - value(-2, "Do not submit")); + value(-1, "I would prefer this is not merged as is"), + value(-2, "This shall not be merged")); public static LabelValue value(int value, String text) { return new LabelValue((short) value, text);