summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoussef Elghareeb <ghareeb@google.com>2023-10-16 11:34:36 +0200
committerYoussef Elghareeb <ghareeb@google.com>2023-10-16 11:51:39 +0200
commit7d61b886cf89eeebd4bef5d1b1b341df3fcb4aeb (patch)
tree33ef320750d6646f9b73678719716be2e10b57aa
parentd8c9651151b4741a75e479a15f42280c49024c43 (diff)
Revert change to UrlModule in change I622c48491
Change I622c48491 made UrlModule depend on StaticModule. We exclude StaticModule in our internal fork of Gerrit hence this change broke our build. Release-Notes: skip Change-Id: I5603f73e0e74bb2154e0e1d13b3ac2d20b6d853c
-rw-r--r--java/com/google/gerrit/httpd/UrlModule.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/google/gerrit/httpd/UrlModule.java b/java/com/google/gerrit/httpd/UrlModule.java
index abca415a24..5a898a1189 100644
--- a/java/com/google/gerrit/httpd/UrlModule.java
+++ b/java/com/google/gerrit/httpd/UrlModule.java
@@ -14,7 +14,6 @@
package com.google.gerrit.httpd;
-import static com.google.gerrit.httpd.raw.StaticModule.CHANGE_NUMBER_URI_REGEX;
import static com.google.inject.Scopes.SINGLETON;
import com.google.common.base.Strings;
@@ -73,7 +72,7 @@ class UrlModule extends ServletModule {
serveRegex("^/settings/?$").with(screen(PageLinks.SETTINGS));
serveRegex("^/register$").with(registerScreen(false));
serveRegex("^/register/(.+)$").with(registerScreen(true));
- serveRegex(CHANGE_NUMBER_URI_REGEX).with(NumericChangeIdRedirectServlet.class);
+ serveRegex("^(?:/c)?/([1-9][0-9]*)/?$").with(NumericChangeIdRedirectServlet.class);
serveRegex("^/p/(.*)$").with(queryProjectNew());
serveRegex("^/r/(.+)/?$").with(DirectChangeByCommit.class);