From c4358ca758a3865d6b0f53d2855476c33e697fdd Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Sun, 6 Oct 2013 04:18:40 +0100 Subject: [PATCH] Fix git repository viewer URLs so they support more variants of the Wikimedia URLs I've tested this against the URLs that are exposed within gitblit and gerrit, specifically: * https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AbuseFilter.git * ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter.git * https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter * ssh://stwalkerster@gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter * https://stwalkerster@gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter Change-Id: I36008eced60e32d554a5801bae155611f259f2d1 --- includes/DefaultSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 0a5dc71d8d..11b4ef68b7 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5481,7 +5481,7 @@ $wgGitBin = '/usr/bin/git'; * @since 1.20 */ $wgGitRepositoryViewers = array( - 'https://gerrit.wikimedia.org/r/p/(.*)' => 'https://git.wikimedia.org/commit/%r/%H', + 'https://(?:[a-z0-9_]+@)?gerrit.wikimedia.org/r/(?:p/)?(.*)' => 'https://git.wikimedia.org/commit/%r/%H', 'ssh://(?:[a-z0-9_]+@)?gerrit.wikimedia.org:29418/(.*)' => 'https://git.wikimedia.org/commit/%r/%H', ); -- 2.20.1