mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/third_party/gerrit/0002-Syntax-highlight-nix.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

25 lines
841 B
Diff
Raw Normal View History

chore(gerrit): update to 3.2.2-1002-gea26b5ee7a This is the version currently (2020-07-25) deployed on https://gerrit-review.googlesource.com/, and includes features such as The Attention Set. Change-Id: Idf29f96c38d7737efb0d64c4cd294dab46fe5412 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1437 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-07-25 22:17:39 +02:00
From 1310ad5e56248bf216774cd13e828ba76e0c6f65 Mon Sep 17 00:00:00 2001
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:02:32 +0100
fix(gerrit): fix hovercards under Firefox Firefox doesn't implement the IE6 fromElement/toElement, and it's not in the MouseEvent spec (at the moment). Replace with the worse-named but better-specified target and relatedTarget attributes instead. Upstream change: https://gerrit-review.googlesource.com/q/I9eeb26c032a38de9d7185749373c7982c796acb2 Change-Id: I9f9a1eb9342bc80b91b5b364a04cc5fa9a7ccaeb Reviewed-on: https://cl.tvl.fyi/c/depot/+/1442 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
2020-07-26 02:17:00 +02:00
Subject: [PATCH 2/7] Syntax highlight nix
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
---
.../app/elements/diff/gr-syntax-layer/gr-syntax-layer.js | 1 +
1 file changed, 1 insertion(+)
feat(gerrit): Syntax highlight .nix files. highlight.js supports syntax highlighting .nix files, but the Gerrit diff components doesn't map the .nix mimetype onto the nix language. .nix appears to already be taken by another mimetype that isn't Nix-related, but we just map that onto nix anyway. https://usercontent.irccloud-cdn.com/file/AVhoPvrb/highlighted.png Change-Id: I842b29c78355e5bec580e711e25d693284ab6f59 Reviewed-on: https://cl.tvl.fyi/c/depot/+/253 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: q3k <q3k@q3k.org>
2020-06-14 13:36:04 +02:00
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
chore(gerrit): update to 3.2.2-1002-gea26b5ee7a This is the version currently (2020-07-25) deployed on https://gerrit-review.googlesource.com/, and includes features such as The Attention Set. Change-Id: Idf29f96c38d7737efb0d64c4cd294dab46fe5412 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1437 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-07-25 22:17:39 +02:00
index 6399c4a469..480d2946c3 100644
feat(gerrit): Syntax highlight .nix files. highlight.js supports syntax highlighting .nix files, but the Gerrit diff components doesn't map the .nix mimetype onto the nix language. .nix appears to already be taken by another mimetype that isn't Nix-related, but we just map that onto nix anyway. https://usercontent.irccloud-cdn.com/file/AVhoPvrb/highlighted.png Change-Id: I842b29c78355e5bec580e711e25d693284ab6f59 Reviewed-on: https://cl.tvl.fyi/c/depot/+/253 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: q3k <q3k@q3k.org>
2020-06-14 13:36:04 +02:00
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
chore(gerrit): update to 3.2.2-1002-gea26b5ee7a This is the version currently (2020-07-25) deployed on https://gerrit-review.googlesource.com/, and includes features such as The Attention Set. Change-Id: Idf29f96c38d7737efb0d64c4cd294dab46fe5412 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1437 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-07-25 22:17:39 +02:00
@@ -99,6 +99,7 @@ const LANGUAGE_MAP = {
feat(gerrit): Syntax highlight .nix files. highlight.js supports syntax highlighting .nix files, but the Gerrit diff components doesn't map the .nix mimetype onto the nix language. .nix appears to already be taken by another mimetype that isn't Nix-related, but we just map that onto nix anyway. https://usercontent.irccloud-cdn.com/file/AVhoPvrb/highlighted.png Change-Id: I842b29c78355e5bec580e711e25d693284ab6f59 Reviewed-on: https://cl.tvl.fyi/c/depot/+/253 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: q3k <q3k@q3k.org>
2020-06-14 13:36:04 +02:00
'text/x-vhdl': 'vhdl',
'text/x-yaml': 'yaml',
'text/vbscript': 'vbscript',
+ 'application/x-mix-transfer': 'nix',
};
const ASYNC_DELAY = 10;
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
--
fix(gerrit): Load fonts from Google Fonts instead. This also incidentally includes a fix for _not_ loading fonts from Google Fonts, but I don't really care about that. Change-Id: I6e00791d0ba06cb1e3c029e1b8617c33000d2ab1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1041 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
2020-07-11 02:48:54 +02:00
2.27.0
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
Reference in a new issue Copy permalink