Merge "Use correct UI label for enableReviewerByEmail"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java index d7fb072..1aecd08 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
@@ -75,6 +75,8 @@ String rejectImplicitMerges(); + String enableReviewerByEmail(); + String headingMaxObjectSizeLimit(); String headingGroupOptions();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties index 200a0c5..4c7153e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
@@ -37,6 +37,7 @@ headingParentProjectName = Rights Inherit From parentSuggestions = Parent Suggestion columnProjectName = Project Name +enableReviewerByEmail = Enable adding unregistered users as reviewers and CCs on changes headingGroupUUID = Group UUID headingOwner = Owners
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java index 7830696..fa843f2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
@@ -268,7 +268,7 @@ enableReviewerByEmail = newInheritedBooleanBox(); saveEnabler.listenTo(enableReviewerByEmail); - grid.addHtml(AdminConstants.I.rejectImplicitMerges(), enableReviewerByEmail); + grid.addHtml(AdminConstants.I.enableReviewerByEmail(), enableReviewerByEmail); maxObjectSizeLimit = new NpTextBox(); saveEnabler.listenTo(maxObjectSizeLimit);