diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-08-28T11·31+0300 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-08-28T15·32+0000 |
| commit | fe225d48a18f722c03e31fdeb9c6c6c4ac6bb9d8 (patch) | |
| tree | 027383b912447ccaf3b4a0b42e3dbb2c77fad84b /third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch | |
| parent | 0c1b8f954ebecc4fd0db53a559acaaeaa7c80824 (diff) | |
feat(3p/gerrit): Upgrade Gerrit and plugins to v3.4.0 r/2798
Brings us back to a stable version of Gerrit instead of a random commit. Note that Gerrit 3.4.1 is out, but due to a bug it can not be built publicly because it accidentally points at a private submodule (this is being fixed upstream). Change-Id: I0376c63a649498cef999dfa99bfccba511f2c8da Reviewed-on: https://cl.tvl.fyi/c/depot/+/3444 Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch')
| -rw-r--r-- | third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch b/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch index 07c527b5fd52..8e78e5f535e3 100644 --- a/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch +++ b/third_party/gerrit/0004-Add-titles-to-CLs-over-HTTP.patch @@ -1,4 +1,4 @@ -From 152fd4ed4cc45d467fd56945debb759870cd53ca Mon Sep 17 00:00:00 2001 +From 32bf13d8316f93828d2ff47ccfca38d4e7a634b1 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown <git@lukegb.com> Date: Thu, 2 Jul 2020 23:03:02 +0100 Subject: [PATCH 4/7] Add titles to CLs over HTTP @@ -102,10 +102,10 @@ index 3f2c2028ae..7861c007df 100644 } catch (URISyntaxException | RestApiException e) { throw new IOException(e); diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java -index cac716feb9..6b17d8ea6f 100644 +index bb1eb92525..6b20c504d2 100644 --- a/java/com/google/gerrit/httpd/raw/StaticModule.java +++ b/java/com/google/gerrit/httpd/raw/StaticModule.java -@@ -223,11 +223,13 @@ public class StaticModule extends ServletModule { +@@ -224,11 +224,13 @@ public class StaticModule extends ServletModule { @CanonicalWebUrl @Nullable String canonicalUrl, @GerritServerConfig Config cfg, GerritApi gerritApi, @@ -195,7 +195,7 @@ index 0000000000..8fd2053ad0 + } +} diff --git a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy -index 93584c6b05..6e6a1e5401 100644 +index 11717fb8a4..1ae9046360 100644 --- a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy +++ b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy @@ -33,10 +33,12 @@ @@ -213,5 +213,5 @@ index 93584c6b05..6e6a1e5401 100644 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">{\n} -- -2.29.2 +2.32.0 |