Merge branch 'stable-3.0' * stable-3.0: Upgrade bazlets to latest stable-3.0 Upgrade bazlets to latest stable-2.16 Change-Id: I2b267ac93a7f58b22e7453a37b398bc03121063b
diff --git a/WORKSPACE b/WORKSPACE index 380ccf8..c9cab52 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "4909dd878ded009edc140319246a2e0681763743", + commit = "f30a992da9fc855dce819875afb59f9dd6f860cd", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java index d7694d9..8cfed27 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java +++ b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
@@ -15,6 +15,7 @@ package com.googlesource.gerrit.plugins.changemessage.rest; import com.google.gerrit.extensions.annotations.PluginName; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.PluginConfig; @@ -33,9 +34,9 @@ } @Override - public String apply(ChangeResource rsrc) throws NoSuchProjectException { + public Response apply(ChangeResource rsrc) throws NoSuchProjectException { PluginConfig cfg = cfgFactory.getFromProjectConfigWithInheritance(rsrc.getProject(), pluginName); - return cfg.getString("changeInfo"); + return Response.ok(cfg.getString("changeInfo")); } }