opendev/gerrit
Code Issues Proposed changes

Merge "Enable PolyGerrit UI per default"

Browse Source
This commit is contained in:
Dave Borowitz
2016-10-25 10:38:37 +00:00
committed by Gerrit Code Review
parent 2fd871c9bd 23acd20d90
commit 1321b245db
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
View File

@@ -66,7 +66,6 @@ public class ServerInfoIT extends AbstractDaemonTest {
@GerritConfig(name = "gerrit.allProjects", value = "Root"), @GerritConfig(name = "gerrit.allProjects", value = "Root"),
@GerritConfig(name = "gerrit.allUsers", value = "Users"), @GerritConfig(name = "gerrit.allUsers", value = "Users"),
@GerritConfig(name = "gerrit.enableGwtUi", value = "true"), @GerritConfig(name = "gerrit.enableGwtUi", value = "true"),
@GerritConfig(name = "gerrit.enablePolyGerrit", value = "true"),
@GerritConfig(name = "gerrit.reportBugText", value = "REPORT BUG"), @GerritConfig(name = "gerrit.reportBugText", value = "REPORT BUG"),
@GerritConfig(name = "gerrit.reportBugUrl", value = "https://example.com/report"), @GerritConfig(name = "gerrit.reportBugUrl", value = "https://example.com/report"),

2
gerrit-server/src/main/java/com/google/gerrit/server/config/GerritOptions.java
View File

@@ -33,7 +33,7 @@ public class GerritOptions {
boolean forcePolyGerritDev) { boolean forcePolyGerritDev) {
this.slave = slave; this.slave = slave;
this.enablePolyGerrit = forcePolyGerritDev this.enablePolyGerrit = forcePolyGerritDev
|| cfg.getBoolean("gerrit", null, "enablePolyGerrit", false); || cfg.getBoolean("gerrit", null, "enablePolyGerrit", true);
this.enableGwtUi = cfg.getBoolean("gerrit", null, "enableGwtUi", true); this.enableGwtUi = cfg.getBoolean("gerrit", null, "enableGwtUi", true);
this.forcePolyGerritDev = forcePolyGerritDev; this.forcePolyGerritDev = forcePolyGerritDev;
this.headless = headless || (!enableGwtUi && !enablePolyGerrit); this.headless = headless || (!enableGwtUi && !enablePolyGerrit);