summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin <edwin.kempin@sap.com>2014-04-10 06:28:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-10 06:28:47 +0000
commit9f821d2ba937e9a9ac71dd7f11e17b7718657bd2 (patch)
tree02cd5f5185838a9738ee8c0874856266fb450bb3
parentcecf90acc1e6926a6cc58b9efcd9eadbd41a9c37 (diff)
parent1b9a36a091e774a83b6cdd307ced193281d62fad (diff)
Merge "Always auto confirm adding reviewers for set-reviewers SSH command" into stable-2.8
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java2
-rw-r--r--gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
index 13deeb06b8..faec4f7283 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
@@ -77,7 +77,7 @@ public class PostReviewers implements RestModifyView<ChangeResource, Input> {
public static class Input {
@DefaultInput
public String reviewer;
- Boolean confirmed;
+ public Boolean confirmed;
boolean confirmed() {
return Objects.firstNonNull(confirmed, false);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
index 6dc79fff0e..c1facef5a8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
@@ -139,6 +139,7 @@ public class SetReviewersCommand extends SshCommand {
for (String reviewer : toAdd) {
PostReviewers.Input input = new PostReviewers.Input();
input.reviewer = reviewer;
+ input.confirmed = true;
String error;
try {
error = post.apply(changeRsrc, input).error;