Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384756 )

Change subject: Git::clone tidy up default gerrit URLs
......................................................................


Git::clone tidy up default gerrit URLs

The /p/ and .git parts are superfluous, and Gerrit has some edge
cases (mostly submodule-related) where they get a little wonky.

The canonical url is /r/foo/bar

Change-Id: I4a3a556d2d36eaef631a71d2a7a90ff11f7a7eab
---
M modules/git/manifests/clone.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index 3dcfe36..e0d693f 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -68,8 +68,8 @@
     $default_url_format = $source ? {
         'phabricator' => 'https://phabricator.wikimedia.org/diffusion/%.git',
         'github'      => 'https://github.com/wikimedia/%s.git',
-        'gerrit'      => 'https://gerrit.wikimedia.org/r/p/%s.git',
-        default       => 'https://gerrit.wikimedia.org/r/p/%s.git',
+        'gerrit'      => 'https://gerrit.wikimedia.org/r/%s',
+        default       => 'https://gerrit.wikimedia.org/r/%s',
     }
 
     $remote = $origin ? {

-- 
To view, visit https://gerrit.wikimedia.org/r/384756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a3a556d2d36eaef631a71d2a7a90ff11f7a7eab
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to