Remove reportBugText config

Bug: Issue 11137
Change-Id: If82300d372b7bb5ff0941371f4065d9556b1be58
This commit is contained in:
Ben Rohlfs
2019-07-09 10:58:32 +02:00
parent bab8a616f0
commit 9b191a06bb
5 changed files with 0 additions and 16 deletions

View File

@@ -2046,14 +2046,6 @@ URL to direct users to when they need to report a bug.
By default unset, meaning no bug report URL will be displayed. Administrators
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.enableReverseDnsLookup]]gerrit.enableReverseDnsLookup::
+
Enable reverse DNS lookup during computing ref log entry for identified user,

View File

@@ -1799,9 +1799,6 @@ Gerrit base path even if this value is unset.)
Whether to enable the web UI for editing GPG keys.
|`report_bug_url` |optional|
link:config-gerrit.html#gerrit.reportBugUrl[URL to report bugs].
|`report_bug_text` |optional, not set if default|
link:config-gerrit.html#gerrit.reportBugText[Display text for report
bugs link].
|=================================
[[hit-ration-info]]

View File

@@ -21,6 +21,5 @@ public class GerritInfo {
public String docUrl;
public Boolean editGpgKeys;
public String reportBugUrl;
public String reportBugText;
public String primaryWeblinkName;
}

View File

@@ -293,7 +293,6 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
info.allProjects = allProjectsName.get();
info.allUsers = allUsersName.get();
info.reportBugUrl = config.getString("gerrit", null, "reportBugUrl");
info.reportBugText = config.getString("gerrit", null, "reportBugText");
info.docUrl = getDocUrl();
info.docSearch = docSearcher.isAvailable();
info.editGpgKeys =

View File

@@ -70,7 +70,6 @@ public class ServerInfoIT extends AbstractDaemonTest {
// gerrit
@GerritConfig(name = "gerrit.allProjects", value = "Root")
@GerritConfig(name = "gerrit.allUsers", value = "Users")
@GerritConfig(name = "gerrit.reportBugText", value = "REPORT BUG")
@GerritConfig(name = "gerrit.reportBugUrl", value = "https://example.com/report")
// suggest
@@ -112,7 +111,6 @@ public class ServerInfoIT extends AbstractDaemonTest {
assertThat(i.gerrit.allProjects).isEqualTo("Root");
assertThat(i.gerrit.allUsers).isEqualTo("Users");
assertThat(i.gerrit.reportBugUrl).isEqualTo("https://example.com/report");
assertThat(i.gerrit.reportBugText).isEqualTo("REPORT BUG");
// plugin
assertThat(i.plugin.jsResourcePaths).isEmpty();
@@ -179,7 +177,6 @@ public class ServerInfoIT extends AbstractDaemonTest {
assertThat(i.gerrit.allProjects).isEqualTo(AllProjectsNameProvider.DEFAULT);
assertThat(i.gerrit.allUsers).isEqualTo(AllUsersNameProvider.DEFAULT);
assertThat(i.gerrit.reportBugUrl).isNull();
assertThat(i.gerrit.reportBugText).isNull();
// plugin
assertThat(i.plugin.jsResourcePaths).isEmpty();