jenkins-bot has submitted this change and it was merged.

Change subject: add cawikimedia to wikiversion, MWMultiVersion
......................................................................


add cawikimedia to wikiversion, MWMultiVersion

Change-Id: I944e6ae58f9864ddadf3d8015aec1c9557038482
RT: 8206
---
M multiversion/MWMultiVersion.php
M tests/multiversion/MWMultiVersionTest.php
M wikiversions.json
3 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index d3cbdef..9ad7796 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -171,7 +171,7 @@
                                || ( $matches[2] === 'wikimedia' && in_array(
                                        $lang,
                                        array(
-                                               'ar', 'bd', 'be', 'br', 'co', 
'dk', 'et', 'fi', 'il', 'mk', 'mx', 'nl', 'noboard-chapters',
+                                               'ar', 'bd', 'be', 'br', 'ca', 
'co', 'dk', 'et', 'fi', 'il', 'mk', 'mx', 'nl', 'noboard-chapters',
                                                'no', 'nyc', 'nz', 'pa-us', 
'pl', 'rs', 'ru', 'se', 'tr', 'ua', 'uk', 've'
                                        )
                        ) ) ) {
diff --git a/tests/multiversion/MWMultiVersionTest.php 
b/tests/multiversion/MWMultiVersionTest.php
index 81aae25..93e1b76 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -100,6 +100,7 @@
                        array( 'bdwikimedia', 'bd.wikimedia.org' ),
                        array( 'bewikimedia', 'be.wikimedia.org' ),
                        array( 'brwikimedia', 'br.wikimedia.org' ),
+                       array( 'cawikimedia', 'ca.wikimedia.org' ),
                        array( 'cowikimedia', 'co.wikimedia.org' ),
                        array( 'dkwikimedia', 'dk.wikimedia.org' ),
                        array( 'etwikimedia', 'et.wikimedia.org' ),
diff --git a/wikiversions.json b/wikiversions.json
index 280822e..25ba1a7 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
     "aawiki": "php-1.24wmf19",
     "aawikibooks": "php-1.24wmf20",
     "aawiktionary": "php-1.24wmf20",
@@ -115,6 +116,7 @@
     "bxrwiki": "php-1.24wmf19",
     "cawiki": "php-1.24wmf19",
     "cawikibooks": "php-1.24wmf20",
+    "cawikimedia": "php-1.24wmf20",
     "cawikinews": "php-1.24wmf20",
     "cawikiquote": "php-1.24wmf20",
     "cawikisource": "php-1.24wmf20",
@@ -883,4 +885,4 @@
     "zuwiki": "php-1.24wmf19",
     "zuwikibooks": "php-1.24wmf20",
     "zuwiktionary": "php-1.24wmf20"
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I944e6ae58f9864ddadf3d8015aec1c9557038482
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jeremyb <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Techman224 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to