Merge "Fix returning of 'Email Reviewers' capability via REST"
diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index 00d4ca6..a8a73d2 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -35,7 +35,8 @@
     "queryLimit": {
       "min": 0,
       "max": 500
-    }
+    },
+    "emailReviewers": true
   }
 ----
 
@@ -63,6 +64,7 @@
     "createAccount": true,
     "createGroup": true,
     "createProject": true,
+    "emailReviewers": true,
     "killTask": true,
     "viewCaches": true,
     "flushCaches": true,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java
index 1868bd7..c0052b9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java
@@ -17,6 +17,7 @@
 import static com.google.gerrit.common.data.GlobalCapability.CREATE_ACCOUNT;
 import static com.google.gerrit.common.data.GlobalCapability.CREATE_GROUP;
 import static com.google.gerrit.common.data.GlobalCapability.CREATE_PROJECT;
+import static com.google.gerrit.common.data.GlobalCapability.EMAIL_REVIEWERS;
 import static com.google.gerrit.common.data.GlobalCapability.FLUSH_CACHES;
 import static com.google.gerrit.common.data.GlobalCapability.KILL_TASK;
 import static com.google.gerrit.common.data.GlobalCapability.PRIORITY;
@@ -101,6 +102,7 @@
     have.put(CREATE_ACCOUNT, cc.canCreateAccount());
     have.put(CREATE_GROUP, cc.canCreateGroup());
     have.put(CREATE_PROJECT, cc.canCreateProject());
+    have.put(EMAIL_REVIEWERS, cc.canEmailReviewers());
     have.put(KILL_TASK, cc.canKillTask());
     have.put(VIEW_CACHES, cc.canViewCaches());
     have.put(FLUSH_CACHES, cc.canFlushCaches());