Merge changes If3aaa629,I01deaca3 into stable-2.16
* changes: PG: Make commitlink selection configurable and consistent Add config gerrit.primaryWeblinkName
This commit is contained in:
@@ -26,4 +26,5 @@ public class GerritInfo {
|
||||
public String reportBugUrl;
|
||||
public String reportBugText;
|
||||
public Set<UiType> webUis;
|
||||
public String primaryWeblinkName;
|
||||
}
|
||||
|
||||
@@ -313,6 +313,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
|
||||
if (gerritOptions.enableGwtUi()) {
|
||||
info.webUis.add(UiType.GWT);
|
||||
}
|
||||
info.primaryWeblinkName = config.getString("gerrit", null, "primaryWeblinkName");
|
||||
return info;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user