Merge "Make bug report URL unset by default"

Documentation/config-gerrit.txt

@@ -1537,15 +1537,17 @@ same host as Gerrit.
 
 [[gerrit.reportBugUrl]]gerrit.reportBugUrl::
 +
-URL to direct users to when they need to report a bug about the
+URL to direct users to when they need to report a bug.
-Gerrit service. By default this links to the upstream Gerrit
++
-Code Review's own bug tracker but could be directed to the system
+By default unset, meaning no bug report URL will be displayed. Administrators
-administrator's ticket queue.
+should set this to the URL of their issue tracker, if necessary.
 
 [[gerrit.reportBugText]]gerrit.reportBugText::
 +
 Text to be displayed in the link to the bug report URL.
 +
+Only used when `gerrit.reportBugUrl` is set.
++
 Defaults to "Report Bug".
 
 [[gerrit.changeScreen]]gerrit.changeScreen::

gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java

@@ -472,14 +472,17 @@ public class Gerrit implements EntryPoint {
 
     btmmenu.add(new InlineHTML(M.poweredBy(vs)));
 
-    final String reportBugText = getConfig().getReportBugText();
+    String reportBugUrl = getConfig().getReportBugUrl();
-    Anchor a = new Anchor(
+    if (reportBugUrl != null) {
-        reportBugText == null ? C.reportBug() : reportBugText,
+      String reportBugText = getConfig().getReportBugText();
-        getConfig().getReportBugUrl());
+      Anchor a = new Anchor(
-    a.setTarget("_blank");
+          reportBugText == null ? C.reportBug() : reportBugText,
-    a.setStyleName("");
+          reportBugUrl);
-    btmmenu.add(new InlineLabel(" | "));
+      a.setTarget("_blank");
-    btmmenu.add(a);
+      a.setStyleName("");
+      btmmenu.add(new InlineLabel(" | "));
+      btmmenu.add(a);
+    }
     btmmenu.add(new InlineLabel(" | "));
     btmmenu.add(new InlineLabel(C.keyHelp()));
   }

gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java

@@ -148,9 +148,7 @@ class GerritConfigProvider implements Provider<GerritConfig> {
 
     config.setNewFeatures(cfg.getBoolean("gerrit", "enableNewFeatures", true));
 
-    final String reportBugUrl = cfg.getString("gerrit", null, "reportBugUrl");
+    config.setReportBugUrl(cfg.getString("gerrit", null, "reportBugUrl"));
-    config.setReportBugUrl(reportBugUrl != null ?
-        reportBugUrl : "http://code.google.com/p/gerrit/issues/list");
     config.setReportBugText(cfg.getString("gerrit", null, "reportBugText"));
 
     final Set<Account.FieldName> fields = new HashSet<>();