commit d360c388037e136f4665197f268107dd071daa65
author David Pursehouse <dpursehouse@collab.net> Sat Sep 15 01:47:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 15 01:47:17 2018 +0000
tree c57c90f7eb55db52901e9efc8fe83a587dc620d7
parent 3c980fd8d9afa31e2b15c480d1e9492127fae286
parent 4557abd6e1d2141509f963172a7f459a05627d60

Merge "Revert "GetCapabilities#CheckOne: Return json content type"" into stable-2.15

Documentation/rest-api-accounts.txt

diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index 6421358..dc45ff5 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -1092,10 +1092,7 @@
 .Response
 ----
   HTTP/1.1 200 OK
-  Content-Disposition: attachment
-  Content-Type: application/json; charset=UTF-8
 
-  )]}'
   ok
 ----
 

gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java

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 0232bf02..4058a16 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
@@ -24,7 +24,7 @@
 import com.google.gerrit.extensions.config.CapabilityDefinition;
 import com.google.gerrit.extensions.registration.DynamicMap;
 import com.google.gerrit.extensions.restapi.AuthException;
-import com.google.gerrit.extensions.restapi.Response;
+import com.google.gerrit.extensions.restapi.BinaryResult;
 import com.google.gerrit.extensions.restapi.RestReadView;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.OptionUtil;
@@ -157,8 +157,8 @@
   @Singleton
   static class CheckOne implements RestReadView<AccountResource.Capability> {
     @Override
-    public Response<String> apply(Capability resource) {
-      return Response.ok("ok");
+    public BinaryResult apply(Capability resource) {
+      return BinaryResult.create("ok\n");
     }
   }
 }