Remove special x/ handling patch in gerrit
Upstream Gerrit has been fixing this up. It's in 3.2 as of https://gerrit-review.googlesource.com/c/gerrit/+/306519 Change-Id: Ie8196c38629b4893364b969aeb6ac466cff0c93f
This commit is contained in:
parent
b53914f812
commit
3639d7b535
@ -1,13 +0,0 @@
|
|||||||
diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java
|
|
||||||
index 414a120194..9d59535a66 100644
|
|
||||||
--- a/java/com/google/gerrit/httpd/raw/StaticModule.java
|
|
||||||
+++ b/java/com/google/gerrit/httpd/raw/StaticModule.java
|
|
||||||
@@ -71,7 +71,7 @@ public class StaticModule extends ServletModule {
|
|
||||||
"/c/*",
|
|
||||||
"/p/*",
|
|
||||||
"/q/*",
|
|
||||||
- "/x/*",
|
|
||||||
+ //"/x/*",
|
|
||||||
"/admin/*",
|
|
||||||
"/dashboard/*",
|
|
||||||
"/groups/self",
|
|
@ -1,14 +1,5 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
tasks:
|
tasks:
|
||||||
- name: Patch Gerrit's webapp routes to not shadow x/
|
|
||||||
shell: |
|
|
||||||
set -ex
|
|
||||||
GERRIT_BASE=/home/zuul/src/gerrit.googlesource.com/gerrit
|
|
||||||
SYSTEM_CONFIG_BASE=/home/zuul/src/opendev.org/opendev/system-config
|
|
||||||
# Disable the x/ redirection since we have x/ projects
|
|
||||||
patch $GERRIT_BASE/java/com/google/gerrit/httpd/raw/StaticModule.java \
|
|
||||||
$SYSTEM_CONFIG_BASE/docker/gerrit/patches/serve-x-normally.patch
|
|
||||||
|
|
||||||
- name: Build gerrit
|
- name: Build gerrit
|
||||||
include_role:
|
include_role:
|
||||||
name: bazelisk-build
|
name: bazelisk-build
|
||||||
|
Loading…
Reference in New Issue
Block a user