Disable gitweb support when gitweb.type=disabled
Currently GitwebCgiConfig looks for and tries to run gitweb
unless gitweb has been disabled by explicitly setting gitweb.url
or gitweb.cgi to the empty string.
Disabling web links by setting gitweb.type=disabled conveys the
same intent. Treat that setting in the same way.
Change-Id: I3c58f0c6a5dd5eec25c9c889c68fb909cd6518d5
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java
index 836390d..769b3fe 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java
@@ -42,7 +42,8 @@
public static boolean isDisabled(Config cfg) {
return isEmptyString(cfg, "gitweb", null, "url")
- || isEmptyString(cfg, "gitweb", null, "cgi");
+ || isEmptyString(cfg, "gitweb", null, "cgi")
+ || "disabled".equals(cfg.getString("gitweb", null, "type"));
}
public static class LegacyModule extends AbstractModule {
