Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Switch required bazel version to 0.29.1
Change-Id: I9b5ed74c866f8fc2bc642bee8fd6e1e474657a36
diff --git a/WORKSPACE b/WORKSPACE
index d36bcd7..22501bf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "bec81c8319e560d2a92ba0fe35d40d021ffd7708",
+ commit = "5f03aec7c72e743079ea2ecad5530f4684ca7d45",
#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 def7916..d7694d9 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
@@ -19,6 +19,7 @@
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
+import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.inject.Inject;
public class GetChangeInfo implements RestReadView<ChangeResource> {
@@ -32,10 +33,9 @@
}
@Override
- public String apply(ChangeResource rsrc) {
+ public String apply(ChangeResource rsrc) throws NoSuchProjectException {
PluginConfig cfg =
- cfgFactory.getFromProjectConfigWithInheritance(
- rsrc.getControl().getProjectControl().getProjectState(), pluginName);
+ cfgFactory.getFromProjectConfigWithInheritance(rsrc.getProject(), pluginName);
return cfg.getString("changeInfo");
}
}