Merge "Remove 'send email' checkbox from reply box on change screen" into stable-2.9

4 files changed, 1 insertions, 16 deletions

diff --git a/Documentation/images/user-review-ui-change-screen-replying.png b/Documentation/images/user-review-ui-change-screen-replying.png
index 0fd5e80981..0ae85ab0f4 100644
--- a/Documentation/images/user-review-ui-change-screen-replying.png
+++ b/Documentation/images/user-review-ui-change-screen-replying.png
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index 40df914d90..5bc5b44546 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -601,11 +601,6 @@ comment needs to be edited.
 
 The `Post` button publishes the comments and the votes.
 
-The `send email` checkbox controls whether the reply should trigger
-email notifications for other users. Deselecting the checkbox means
-that there will be no email notification about the change update to the
-change author, the reviewers or any other user.
-
 image::images/user-review-ui-change-screen-replying.png[width=800, link="images/user-review-ui-change-screen-replying.png"]
 
 If a user can approve a label that is still required, a quick approve
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
index 64dcd286e4..1c30928405 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
@@ -99,7 +99,6 @@ class ReplyBox extends Composite {
   @UiField Element labelsParent;
   @UiField Grid labelsTable;
   @UiField Button post;
-  @UiField CheckBox email;
   @UiField Button cancel;
   @UiField ScrollPanel commentsPanel;
   @UiField FlowPanel comments;
@@ -188,15 +187,6 @@ class ReplyBox extends Composite {
     }
   }
 
-  @UiHandler("email")
-  void onEmail(ValueChangeEvent<Boolean> e) {
-    if (e.getValue()) {
-      in.notify(ReviewInput.NotifyHandling.ALL);
-    } else {
-      in.notify(ReviewInput.NotifyHandling.NONE);
-    }
-  }
-
   @UiHandler("post")
   void onPost(ClickEvent e) {
     in.message(getMessage());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
index 1b122c5179..3c927fc0d3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
@@ -68,7 +68,7 @@ limitations under the License.
           styleName='{res.style.button}'>
         <ui:attribute name='title'/>
         <div>Post</div>
-      </g:Button> and <g:CheckBox ui:field='email' value='true'>send email</g:CheckBox></ui:msg>
+      </g:Button></ui:msg>
 
       <g:Button ui:field='cancel'
           title='Close reply form (Shortcut: Esc)'