commit | ee8d4210e4b2717d6efc0abcb859bc34b98ed06d | [log] [tgz] |
---|---|---|
author | Dave Borowitz <dborowitz@google.com> | Tue Mar 28 18:59:20 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 28 18:59:20 2017 +0000 |
tree | d9838ed45a3b67aae28138782d58b0569d2fa1d6 | |
parent | 171c455e7056da2731b9834d6121fdb8231968aa [diff] | |
parent | dcd0cfa44b35c350b25ecfd5600d5ddc01eff647 [diff] |
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);