opendev/gerrit
Code Issues Proposed changes

Only forward PolyGerrit URLs when PG is not enabled

Browse Source 
Change-Id: Ib667ed922d58b7d3d279b2ab4d8929d86960c14d
This commit is contained in:
Andrew Bonventre 2016-05-19 17:56:39 -07:00
parent 38dec6084a
commit 7b7aa28b21
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
View File

@ -67,6 +67,8 @@ class UrlModule extends ServletModule {
serve("/").with(HostPageServlet.class);
serve("/Gerrit").with(LegacyGerritServlet.class);
serve("/Gerrit/*").with(legacyGerritScreen());
// Forward PolyGerrit URLs to their respective GWT equivalents.
serveRegex("^/(c|q|x|admin|dashboard|settings)/(.*)").with(gerritUrl());
}
serve("/cat/*").with(CatServlet.class);
@ -87,9 +89,6 @@ class UrlModule extends ServletModule {
serve("/watched").with(query("is:watched status:open"));
serve("/starred").with(query("is:starred"));
// Forward PolyGerrit URLs to their respective GWT equivalents.
serveRegex("^/(c|q|x|admin|dashboard|settings)/(.*)").with(gerritUrl());
serveRegex("^/settings/?$").with(screen(PageLinks.SETTINGS));
serveRegex("^/register/?$").with(screen(PageLinks.REGISTER + "/"));
serveRegex("^/([1-9][0-9]*)/?$").with(directChangeById());