commit d35860a6d1721ad497c17ca5446a894588ffb9cb
author David Pursehouse <dpursehouse@collab.net> Mon May 20 19:47:04 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon May 20 19:47:04 2019 +0900
tree 45d21e662d09f619439a5321ec54f8e8d9c97ba0
parent 4a17530a1278af49532a91b3c13761009793ef62
parent 3b5f4e2b950874d09aad9de1c0c45407f7370f6a

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Make transitive starlark loads explicit

Change-Id: Ic7e3baee83012f25e37365b425ec040330f10f7f

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index cd01a72..ec45369 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "62c3c8e0b4b767d1f3b78998ad1aba42a44a9661",
+    commit = "70d6ae0cee03c456fa4b32c807f3d13c032ef498",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java

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");
   }
 }