commit 16a217cda6a817c6c23e16f5728851915c790880
author Antoine Musso <hashar@free.fr> Fri Jul 30 19:24:46 2021 +0200
committer Antoine Musso <hashar@free.fr> Fri Jul 30 19:29:00 2021 +0200
tree f56b4df6d53b8f06a19282e282a414a946fc8ea1
parent ea302905fef1dacfbbfdf6b3a350978b5792b46e
parent 4c75dad4d45423fb2a992610b9b60ecd768605f1

Merge branch 'stable-3.2'

Bring in all the changes made by Christian Aistleitner for the migration
of Wikimedia to stable-3.2.

Change-Id: Ia2a20068201e3cdc2b50d4e3cca23d5eeed8eba0

BUILD

diff --git a/BUILD b/BUILD
index 39020c2..3c5aaa8 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
-load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
+load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
 load("//tools/bzl:junit.bzl", "junit_tests")
 load("//tools/js:eslint.bzl", "eslint")
 load(

src/main/java/com/googlesource/gerrit/plugins/zuul/HttpModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/zuul/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/zuul/HttpModule.java
index bc6db6b..035daef 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/zuul/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/zuul/HttpModule.java
@@ -22,6 +22,6 @@
 public class HttpModule extends ServletModule {
   @Override
   protected void configureServlets() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new JavaScriptPlugin("zuul.html"));
+    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new JavaScriptPlugin("zuul.js"));
   }
 }