jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332898 )
Change subject: repong: Fix project detection for auto-merge
......................................................................
repong: Fix project detection for auto-merge
Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
---
M repoconfig.commit.json
M repong/repong.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index e8a1949..bb67cfe 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -489,7 +489,7 @@
"repos": {
"wikipedia-android": {
"type": "wmgerrit",
- "url":
"https://gerrit.wikimedia.org/r/apps/android/wikipedia";,
+ "url":
"ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/wikipedia",
"auto-merge": false
}
}
diff --git a/repong/repong.php b/repong/repong.php
index 283e32b..86aa246 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -139,7 +139,7 @@
// Merge patch sets submitted to Wikimedia's Gerrit.
if ( $repo['type'] === 'wmgerrit' && $autoMerge ) {
- $project = str_replace(
'https://gerrit.wikimedia.org/r/', '', $repo['url'] );
+ $project = str_replace(
'ssh://l10n-...@gerrit.wikimedia.org:29418/', '', $repo['url'] );
$process = new Process( $this->bindir .
"/merge-wmgerrit-patches '$project'" );
$process->setTimeout( 120 );
$process->mustRun();
--
To view, visit https://gerrit.wikimedia.org/r/332898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I124698a76bf4a5b24afdf20c037b257ace1bd60c
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
