date:20141014

[MediaWiki-commits] [Gerrit] beta: bastion ssh rule needs the class that defines bastion ip - change (operations/puppet)

2014-10-14 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: beta: bastion ssh rule needs the class that defines bastion ip
..


beta: bastion ssh rule needs the class that defines bastion ip

Change-Id: I155977965394e7cac40031427be5e5267ba5321d
---
M manifests/role/beta.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index d44b1d0..f4046fb 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -83,6 +83,7 @@
 description => 'Trebuchet testing host'
 }
 
+include ::beta::config
 include ::role::deployment::test
 
 # Allow ssh inbound from deployment-bastion.eqiad.wmflabs for testing

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I155977965394e7cac40031427be5e5267ba5321d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] beta: bastion ssh rule needs the class that defines bastion ip - change (operations/puppet)

2014-10-14 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166717

Change subject: beta: bastion ssh rule needs the class that defines bastion ip
..

beta: bastion ssh rule needs the class that defines bastion ip

Change-Id: I155977965394e7cac40031427be5e5267ba5321d
---
M manifests/role/beta.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/166717/1

diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index d44b1d0..f4046fb 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -83,6 +83,7 @@
 description => 'Trebuchet testing host'
 }
 
+include ::beta::config
 include ::role::deployment::test
 
 # Allow ssh inbound from deployment-bastion.eqiad.wmflabs for testing

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I155977965394e7cac40031427be5e5267ba5321d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] Don't add #undefined as redirectHash - change (mediawiki...MobileFrontend)

2014-10-14 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166716

Change subject: Don't add #undefined as redirectHash
..

Don't add #undefined as redirectHash

wgInternalRedirect contains the complete internal redirect, not only
the hash, which results into undefined, if there is no hash. Check for
this, before add the hash to toggle the section.

Follow up: I88f847b488d57c3c3f4dab6bac6cd41a371640de

Bug: 71573
Change-Id: Ie96f0a2a3315b619947b88b26042a09fa3e104ad
(cherry picked from commit 77b20a7b6b72fc63d83307505234fbfce8fe905a)
---
M javascripts/modules/toggling/toggle.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/16/166716/1

diff --git a/javascripts/modules/toggling/toggle.js 
b/javascripts/modules/toggling/toggle.js
index 614fc75..2d53830 100644
--- a/javascripts/modules/toggling/toggle.js
+++ b/javascripts/modules/toggling/toggle.js
@@ -121,14 +121,14 @@
 
function checkHash() {
var internalRedirect = mw.config.get( 
'wgInternalRedirectTargetUrl' ),
+   internalRedirectHash = internalRedirect ? 
internalRedirect.split( '#' )[1] : false,
hash = window.location.hash;
 
if ( hash.indexOf( '#' ) === 0 ) {
reveal( hash );
-   } else if ( internalRedirect ) {
-   internalRedirect = '#' + 
internalRedirect.split( '#' )[1];
-   window.location.hash = internalRedirect;
-   reveal( internalRedirect );
+   } else if ( internalRedirectHash ) {
+   window.location.hash = internalRedirectHash;
+   reveal( internalRedirectHash );
}
}
checkHash();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie96f0a2a3315b619947b88b26042a09fa3e104ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Florianschmidtwelzow 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy-payments_1.22 - change (mediawiki...DonationInterface)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deploy-payments_1.22
..


Merge branch 'master' into deploy-payments_1.22

Conflicts:
DonationInterface.php
tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
tests/Adapter/WorldPay/WorldPayTestCase.php

Change-Id: Ib275bf014a279d607817fc86799d035a4bee693d
---
M DonationInterface.php
D tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
D tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
D tests/Adapter/WorldPay/WorldPayTestCase.php
D tests/includes/Responses/worldpay/AuthorizePaymentForFraud_2208.testresponse
5 files changed, 0 insertions(+), 839 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index 84eff45..8125ba4 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -1098,33 +1098,6 @@
 if ($optionalParts['Stomp'] === true){
require_once( $donationinterface_dir . 
'activemq_stomp/activemq_stomp.php'  );
$wgAutoloadClasses['Stomp'] = $donationinterface_dir . 
'activemq_stomp/Stomp.php';
-<<< HEAD   (0d6a15 Worldpay cleanup: Antifraud filters firing too much)
-===
-}
-
-function efDonationInterfaceUnitTests( &$files ) {
-   global $wgAutoloadClasses;
-
-   $testDir = __DIR__ . '/tests/';
-
-   $files[] = $testDir . 'AllTests.php';
-
-   $wgAutoloadClasses['DonationInterfaceTestCase'] = $testDir . 
'DonationInterfaceTestCase.php';
-
-   $wgAutoloadClasses['TestingAdyenAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingAmazonAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingAmazonGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-   $wgAutoloadClasses['TestingGlobalCollectAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingGlobalCollectGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-   $wgAutoloadClasses['TestingPaypalAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingWorldPayAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingWorldPayGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-
-   $wgAutoloadClasses['TestingLanguage'] = $testDir . 
'includes/test_language/test.language.php';
-   $wgAutoloadClasses['TestingRequest'] = $testDir . 
'includes/test_request/test.request.php';
-
-   return true;
->>> BRANCH (8367d5 Update legal text on landing page)
 }
 
 unset( $optionalParts );
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php 
b/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
deleted file mode 100644
index 6737568..000
--- a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<<< HEAD   (0d6a15 Worldpay cleanup: Antifraud filters firing too much)
-===
-getDonorTestData( 'US' );
-   unset( $init['order_id'] );
-   $init['payment_method'] = 'cc';
-   $init['payment_submethod'] = 'visa';
-   $init['ffname'] = 'cc-vmad';
-
-   $assertNodes = array (
-   'cc-mc' => array (
-   'nodename' => 'input'
-   ),
-   'selected-amount' => array (
-   'nodename' => 'span',
-   'innerhtml' => '$1.55',
-   ),
-   'state' => array (
-   'nodename' => 'select',
-   'selected' => 'CA',
-   ),
-   );
-
-   $this->verifyFormOutput( 'TestingGlobalCollectGateway', $init, 
$assertNodes, true );
-   }
-
-   function testGCFormLoad_FR() {
-   $init = $this->getDonorTestData( 'FR' );
-   unset( $init['order_id'] );
-   $init['payment_method'] = 'cc';
-   $init['payment_submethod'] = 'visa';
-   $init['ffname'] = 'cc-vmaj';
-
-   $assertNodes = array (
-   'selected-amount' => array (
-   'nodename' => 'span',
-   'innerhtml' => '€1.55',
-   ),
-   'fname' => array (
-   'nodename' => 'input',
-   'value' => 'Prénom',
-   ),
-   'lname' => array (
-   'nodename' => 'input',
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy-payments_1.22 - change (mediawiki...DonationInterface)

2014-10-14 Thread Katie Horn (Code Review)

Katie Horn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166715

Change subject: Merge branch 'master' into deploy-payments_1.22
..

Merge branch 'master' into deploy-payments_1.22

Conflicts:
DonationInterface.php
tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
tests/Adapter/WorldPay/WorldPayTestCase.php

Change-Id: Ib275bf014a279d607817fc86799d035a4bee693d
---
M DonationInterface.php
D tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
D tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
D tests/Adapter/WorldPay/WorldPayTestCase.php
D tests/includes/Responses/worldpay/AuthorizePaymentForFraud_2208.testresponse
5 files changed, 0 insertions(+), 839 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/15/166715/1

diff --git a/DonationInterface.php b/DonationInterface.php
index 84eff45..8125ba4 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -1098,33 +1098,6 @@
 if ($optionalParts['Stomp'] === true){
require_once( $donationinterface_dir . 
'activemq_stomp/activemq_stomp.php'  );
$wgAutoloadClasses['Stomp'] = $donationinterface_dir . 
'activemq_stomp/Stomp.php';
-<<< HEAD   (0d6a15 Worldpay cleanup: Antifraud filters firing too much)
-===
-}
-
-function efDonationInterfaceUnitTests( &$files ) {
-   global $wgAutoloadClasses;
-
-   $testDir = __DIR__ . '/tests/';
-
-   $files[] = $testDir . 'AllTests.php';
-
-   $wgAutoloadClasses['DonationInterfaceTestCase'] = $testDir . 
'DonationInterfaceTestCase.php';
-
-   $wgAutoloadClasses['TestingAdyenAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingAmazonAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingAmazonGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-   $wgAutoloadClasses['TestingGlobalCollectAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingGlobalCollectGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-   $wgAutoloadClasses['TestingPaypalAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingWorldPayAdapter'] = $testDir . 
'includes/test_gateway/test.adapter.php';
-   $wgAutoloadClasses['TestingWorldPayGateway'] = $testDir . 
'includes/test_page/test.gateway.pages.php';
-
-   $wgAutoloadClasses['TestingLanguage'] = $testDir . 
'includes/test_language/test.language.php';
-   $wgAutoloadClasses['TestingRequest'] = $testDir . 
'includes/test_request/test.request.php';
-
-   return true;
->>> BRANCH (8367d5 Update legal text on landing page)
 }
 
 unset( $optionalParts );
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php 
b/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
deleted file mode 100644
index 6737568..000
--- a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<<< HEAD   (0d6a15 Worldpay cleanup: Antifraud filters firing too much)
-===
-getDonorTestData( 'US' );
-   unset( $init['order_id'] );
-   $init['payment_method'] = 'cc';
-   $init['payment_submethod'] = 'visa';
-   $init['ffname'] = 'cc-vmad';
-
-   $assertNodes = array (
-   'cc-mc' => array (
-   'nodename' => 'input'
-   ),
-   'selected-amount' => array (
-   'nodename' => 'span',
-   'innerhtml' => '$1.55',
-   ),
-   'state' => array (
-   'nodename' => 'select',
-   'selected' => 'CA',
-   ),
-   );
-
-   $this->verifyFormOutput( 'TestingGlobalCollectGateway', $init, 
$assertNodes, true );
-   }
-
-   function testGCFormLoad_FR() {
-   $init = $this->getDonorTestData( 'FR' );
-   unset( $init['order_id'] );
-   $init['payment_method'] = 'cc';
-   $init['payment_submethod'] = 'visa';
-   $init['ffname'] = 'cc-vmaj';
-
-   $assertNodes = array (
-   'selected-amount' => array (
-   'nodename' => 'span',
-   'innerhtml' => '€1.55',
-   ),
-   'fname' => array (
-   'nodename' => 'input',
-   'value' => 'Prénom',
-   ),
-   'lname' => array (
-

[MediaWiki-commits] [Gerrit] Update legal text on landing page - change (mediawiki...DonationInterface)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Update legal text on landing page
..


Update legal text on landing page

Change-Id: I4f41823dc1c5c97697f3acdf7287768d444d9c17
---
M gateway_common/i18n/interface/fr.json
M tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
M tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
M tests/Adapter/WorldPay/WorldPayTestCase.php
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/gateway_common/i18n/interface/fr.json 
b/gateway_common/i18n/interface/fr.json
index 5fdb436..8f7db0b 100644
--- a/gateway_common/i18n/interface/fr.json
+++ b/gateway_common/i18n/interface/fr.json
@@ -395,7 +395,7 @@
"donate_interface-email-unsub-warning": "Cela vous désabonnera des 
courriels de la Fondation Wikimédia qui vous sont envoyés en tant que donateur. 
Vous pourriez encore recevoir des courriels à cette adresse si elle reste 
associée à un compte d’un de nos projets. Si vous avez des questions, veuillez 
nous contacter par courriel adressé à mailto:donati...@wikimedia.org\";>donati...@wikimedia.org.",
"donate_interface-faqs": "Foire aux questions",
"donate_interface-tax-info": "Informations sur les conditions de 
déductibilité fiscale",
-   "donate_interface-informationsharing": "En faisant ce don, vous 
acceptez notre politique de confidentialité en matière de donation ainsi que de 
partager vos données personnelles avec la Fondation Wikipedia et ses 
prestataires de services situés aux Etats-Unis et ailleurs, dont les lois sur 
la protection de la vie privée ne sont pas forcement équivalentes aux vôtres.",
+   "donate_interface-informationsharing": "En faisant ce don, vous 
acceptez notre politique de confidentialité en matière de donation ainsi que de 
partager vos données personnelles avec la https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&country=FR&language=fr&uselang=fr\";>Fondation
 Wikimédia et ses prestataires de services situés aux Etats-Unis et 
ailleurs.",
"donate_interface-currency-change": "Changer ?",
"donate_interface-bank_transfer_message": "Veuillez noter que votre 
relevé de compte mentionnera « Global Collect » en tant que bénéficiaire 
de ce don. Global Collect est le prestataire autorisé à accepter et 
traiter les paiements au nom de la Fondation Wikimédia. N’oubliez pas de 
mentionner le numéro de référence fourni ici dans votre ordre de virement 
bancaire et n’hésitez pas à adresser un courriel à mailto:donati...@wikimedia.org\";>donati...@wikimedia.org. si vous 
avez toute question ou préoccupation.",
"donate_interface-globalcollect-proxy": "Veuillez noter que votre 
relevé indiquera « Global Collect » comme bénéficiaire de ce don. 
Global Collect est autorisé à accepter et prendre en charge les 
paiements pour le compte de la Wikimedia Foundation.",
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php 
b/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
index 8b9b670..ec5da45 100644
--- a/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
+++ b/tests/Adapter/GlobalCollect/GlobalCollectFormLoadTestCase.php
@@ -70,7 +70,7 @@
),
'informationsharing' => array (
'nodename' => 'p',
-   'innerhtml' => 'En faisant ce don, vous 
acceptez notre politique de confidentialité en matière de donation ainsi que de 
partager vos données personnelles avec la Fondation Wikipedia et ses 
prestataires de services situés aux Etats-Unis et ailleurs, dont les lois sur 
la protection de la vie privée ne sont pas forcement équivalentes aux vôtres.',
+   'innerhtml' => "En faisant ce don, vous 
acceptez notre politique de confidentialité en matière de donation ainsi que de 
partager vos données personnelles avec la https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Tax_Deductibility&country=FR&language=fr&uselang=fr\";>Fondation
 Wikimédia et ses prestataires de services situés aux Etats-Unis et 
ailleurs.",
),
'country' => array (
'nodename' => 'select',
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php 
b/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
index 80efe6c..fe06025 100644
--- a/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
+++ b/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTestCase.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * 
+ *
  * @group Fundraising
  * @group DonationInterface
  * @group GlobalCollect
@@ -143,7 +143,7 @@
),
'informationsharing' =>

[MediaWiki-commits] [Gerrit] Fix crash in sorting of nearby pages - change (apps...wikipedia)

2014-10-14 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166714

Change subject: Fix crash in sorting of nearby pages
..

Fix crash in sorting of nearby pages

IllegalArgumentException: Comparison method violates its general contract

bug: 72066
Change-Id: Ife50b225797cf0a471ac29a6db1d676316a7a860
---
M wikipedia-it/src/main/java/org/wikipedia/nearby/NearbyUnitTests.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyPage.java
3 files changed, 75 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/14/166714/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/nearby/NearbyUnitTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/nearby/NearbyUnitTests.java
index 45f6d57..80db0f5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/nearby/NearbyUnitTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/nearby/NearbyUnitTests.java
@@ -19,7 +19,8 @@
 private static final int FOUR = 4;
 private static final double SHORT_DISTANCE = 0.001d;
 private static final double LONGER_DISTANCE = 0.01d;
-private static final int A_B_DISTANCE = 111320;
+/** dist(origin, point a) */
+private static final int A = 111319;
 
 private Location nextLocation;
 private List nearbyPages;
@@ -37,6 +38,7 @@
 }
 
 public void testSort() throws Exception {
+calcDistances(nearbyPages);
 Collections.sort(nearbyPages, new NearbyDistanceComparator());
 assertEquals("a", nearbyPages.get(0).getTitle());
 assertEquals("b", nearbyPages.get(1).getTitle());
@@ -46,6 +48,7 @@
 public void testSortWithNullLocations() throws Exception {
 nearbyPages.add(new NearbyPage(new JSONObject("{ \"title\": \"d\" 
}")));
 nearbyPages.add(new NearbyPage(new JSONObject("{ \"title\": \"e\" 
}")));
+calcDistances(nearbyPages);
 Collections.sort(nearbyPages, new NearbyDistanceComparator());
 assertEquals("a", nearbyPages.get(0).getTitle());
 assertEquals("b", nearbyPages.get(1).getTitle());
@@ -57,10 +60,16 @@
 
 public void testCompare() throws Exception {
 NearbyPage nullLocPage = new NearbyPage(new JSONObject("{ \"title\": 
\"nowhere\" }"));
+
+calcDistances(nearbyPages);
+nullLocPage.setDistance(getDistance(nullLocPage.getLocation()));
+assertEquals(Integer.MAX_VALUE, nullLocPage.getDistance());
+
 NearbyDistanceComparator comp = new NearbyDistanceComparator();
-assertEquals(A_B_DISTANCE, comp.compare(nearbyPages.get(0), 
nearbyPages.get(1)));
-assertEquals(-1, comp.compare(nearbyPages.get(0), nullLocPage));
-assertEquals(1, comp.compare(nullLocPage, nearbyPages.get(0)));
+assertEquals(A, comp.compare(nearbyPages.get(1), nearbyPages.get(2)));
+assertEquals(-1 * A, comp.compare(nearbyPages.get(2), 
nearbyPages.get(1)));
+assertEquals(Integer.MAX_VALUE - A, comp.compare(nullLocPage, 
nearbyPages.get(2)));
+assertEquals((Integer.MIN_VALUE + 1) + A, 
comp.compare(nearbyPages.get(2), nullLocPage)); // - (max - a)
 assertEquals(0, comp.compare(nullLocPage, nullLocPage));
 }
 
@@ -91,22 +100,30 @@
 
 private class NearbyDistanceComparator implements Comparator {
 public int compare(NearbyPage a, NearbyPage b) {
-if (a.getLocation() == null) {
-if (b.getLocation() == null) {
-return 0;
-} else {
-return 1;
-}
-} else if (b.getLocation() == null) {
-return -1;
-} else {
-return getDistance(a.getLocation()) - 
getDistance(b.getLocation());
-}
+return a.getDistance() - b.getDistance();
+}
+}
+
+//
+// UGLY: copy of production code
+//
+
+/**
+ * Calculates the distances from the origin to the given pages.
+ * This method should be called before sorting.
+ */
+private void calcDistances(List pages) {
+for (NearbyPage page : pages) {
+page.setDistance(getDistance(page.getLocation()));
 }
 }
 
 private int getDistance(Location otherLocation) {
-return (int) nextLocation.distanceTo(otherLocation);
+if (otherLocation == null) {
+return Integer.MAX_VALUE;
+} else {
+return (int) nextLocation.distanceTo(otherLocation);
+}
 }
 
 private static final int ONE_KM = 1000;
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
index a4966ca..4a0bbe4 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
@@ -1,6

[MediaWiki-commits] [Gerrit] Version updates for Cirrus - change (mediawiki/vagrant)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Version updates for Cirrus
..


Version updates for Cirrus

Change-Id: I7e91415e7781a60cd072c7bfc1f1a683979a300e
---
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/elasticsearch/manifests/init.pp 
b/puppet/modules/elasticsearch/manifests/init.pp
index 0029d28..84323a0 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -5,7 +5,7 @@
 #
 class elasticsearch {
 package { 'elasticsearch':
-ensure => '1.3.2',
+ensure => '1.3.4',
 }
 
 package { 'openjdk-7-jre-headless':
diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index d1de517..299aba2 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -36,7 +36,13 @@
 elasticsearch::plugin { 'highlighter':
 group   => 'org.wikimedia.search.highlighter',
 name=> 'experimental-highlighter-elasticsearch-plugin',
-version => '0.0.11',
+version => '0.0.12',
+}
+## Trigram accelerated regular expressions
+elasticsearch::plugin { 'extra':
+group   => 'org.wikimedia.search',
+name=> 'extra',
+version => '0.0.1',
 }
 
 mediawiki::extension { 'Elastica': }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e91415e7781a60cd072c7bfc1f1a683979a300e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Version updates for Cirrus - change (mediawiki/vagrant)

2014-10-14 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166713

Change subject: Version updates for Cirrus
..

Version updates for Cirrus

Change-Id: I7e91415e7781a60cd072c7bfc1f1a683979a300e
---
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/13/166713/1

diff --git a/puppet/modules/elasticsearch/manifests/init.pp 
b/puppet/modules/elasticsearch/manifests/init.pp
index 0029d28..84323a0 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -5,7 +5,7 @@
 #
 class elasticsearch {
 package { 'elasticsearch':
-ensure => '1.3.2',
+ensure => '1.3.4',
 }
 
 package { 'openjdk-7-jre-headless':
diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index d1de517..299aba2 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -36,7 +36,13 @@
 elasticsearch::plugin { 'highlighter':
 group   => 'org.wikimedia.search.highlighter',
 name=> 'experimental-highlighter-elasticsearch-plugin',
-version => '0.0.11',
+version => '0.0.12',
+}
+## Trigram accelerated regular expressions
+elasticsearch::plugin { 'extra':
+group   => 'org.wikimedia.search',
+name=> 'extra',
+version => '0.0.1',
 }
 
 mediawiki::extension { 'Elastica': }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e91415e7781a60cd072c7bfc1f1a683979a300e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 

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

[MediaWiki-commits] [Gerrit] mediawiki::monitoring::webserver: tidy - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: mediawiki::monitoring::webserver: tidy
..


mediawiki::monitoring::webserver: tidy

Change-Id: Ib90682632775630e54353ae24adc369b8e96b142
---
M modules/mediawiki/files/monitoring/collectors/hhvm.py
M modules/mediawiki/manifests/monitoring/webserver.pp
2 files changed, 24 insertions(+), 61 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py 
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
index 2035f25..dc0703c 100644
--- a/modules/mediawiki/files/monitoring/collectors/hhvm.py
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -1,60 +1,29 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
 """
-Collect stats from hhvm
-
-### Dependencies
-
- * json
- * urllib2
+  Diamond collector for HHVM
 
 """
-
 import json
 import urllib2
+
 import diamond.collector
 
 
-class hhvm_healthCollector(diamond.collector.Collector):
-
-def get_default_config_help(self):
-pass
+class hhvmHealthCollector(diamond.collector.Collector):
+"""Collect health metrics from HHVM."""
 
 def get_default_config(self):
-config = super(hhvm_healthCollector, self).get_default_config()
-config.update({
-'host': 'localhost:9002',
-'url': '/',
-'timeout': 5,
-})
+config = super(hhvmHealthCollector, self).get_default_config()
+config.update(url='http://localhost:9002/check-health', timeout=5)
 return config
 
 def collect(self):
-# publish stats with self.publish
-url = "http://{}{}".format(
-self.config['host'],
-self.config['url']
-)
-headers = {
-'User-agent': 'diamond-hhvm-collector/1.0',
-}
+req = urllib2.Request(self.config['url'])
+req.add_header('User-Agent', 'diamond-hhvm-collector/1.0')
 try:
-req = urllib2.Request(url, None, headers)
 response = urllib2.urlopen(req, None, self.config['timeout'])
-except urllib2.HTTPError as e:
-self.log.error(
-'Got error status code %d from the HTTP server',
-e.code)
-return
-except urllib2.URLError as e:
-self.log.error('Could not contact server on localhost')
-return
-
-try:
 data = json.load(response)
-for k, v in data.iteritems():
-self.publish(k, v)
-except:
-self.log.error(
-"error parsing and publishing data received:\n%s",
-response.read())
-return
+for key, val in data.items():
+self.publish(key, val)
+except (IOError, ValueError):
+self.log.exception('Failed to collect metrics')
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp 
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 1b1b868..e9ad4cc 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -1,19 +1,15 @@
-class mediawiki::monitoring::webserver ($ensure = 'present'){
-include ::stdlib
+class mediawiki::monitoring::webserver( $ensure = present ) {
 include ::apache
 include ::network::constants
 
 if ubuntu_version('< trusty') {
-$endpoints = {
-'apc' => 'apc_stats.php'
-}
-}
-else {
+$endpoints = {'apc' => 'apc_stats.php'}
+} else {
 $endpoints = {}
-diamond::collector { 'hhvm_health':
+
+diamond::collector { 'hhvmHealth':
 ensure   => $ensure,
 source   => 
'puppet:///modules/mediawiki/monitoring/collectors/hhvm.py',
-settings => { url => '/check-health' },
 require  => Apache::Site['hhvm_admin'],
 }
 
@@ -37,20 +33,19 @@
 
 }
 
-# Basic vhost files
 file { '/var/www/monitoring':
 ensure  => ensure_directory($ensure),
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-require => Class['::mediawiki::packages']
+require => Class['::mediawiki::packages'],
 }
 
 
-apache::site {'monitoring':
-ensure   => present,
-priority => '99',
+apache::site { 'monitoring':
+ensure   => $ensure,
 content  => template('mediawiki/apache/monitoring.conf.erb'),
+priority => 99,
 require  => Package['apache2'],
 }
 
@@ -59,16 +54,15 @@
 # This define is designed to be private to this class,
 # this is why it's defined within the class itself.
 # We are choosing convention over configuration here, which is usualy wise.
-define endpoint ($ensure = $::mediawiki::monitoring::webserver::ensure) {
-
+define endpoint( $ensure = $::mediawiki::monitoring:

[MediaWiki-commits] [Gerrit] Upgrade jStorage to v0.4.12 - change (mediawiki/core)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade jStorage to v0.4.12
..


Upgrade jStorage to v0.4.12

Project site

* http://www.jstorage.info/ and https://github.com/andris9/jStorage/tree/v0.4.12

jquery.jStorage.js file

* https://github.com/andris9/jStorage/blob/v0.4.12/jstorage.js

Author and contact

* Andris Reinman and email andris.rein...@gmail.com

README

* https://github.com/andris9/jStorage/blob/v0.4.12/README.md

Upgrading from 0.4.10 to 0.4.12.

Change-Id: I62899c8a2a7b9b2ae5b0f4b6ec06ee24cb966806
---
M RELEASE-NOTES-1.25
M resources/lib/jquery/jquery.jStorage.js
2 files changed, 16 insertions(+), 5 deletions(-)

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



diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 8c5a716..2d5e7f4 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -24,6 +24,7 @@
 * (bug 67341) SVG images will no longer be base64-encoded when being embedded
   in CSS. This results in slight size increase before gzip compression (due to
   percent-encoding), but up to 20% decrease after it.
+* Upgrade jStorage to v0.4.12.
 
 === Bug fixes in 1.25 ===
 * (bug 71003) No additional code will be generated to try to load CSS-embedded
diff --git a/resources/lib/jquery/jquery.jStorage.js 
b/resources/lib/jquery/jquery.jStorage.js
index cc11aed..45e19ac 100644
--- a/resources/lib/jquery/jquery.jStorage.js
+++ b/resources/lib/jquery/jquery.jStorage.js
@@ -34,12 +34,15 @@
  * For more information, please refer to 
  */
 
+/* global ActiveXObject: false */
+/* jshint browser: true */
+
 (function() {
 'use strict';
 
 var
 /* jStorage version */
-JSTORAGE_VERSION = '0.4.10',
+JSTORAGE_VERSION = '0.4.12',
 
 /* detect a dollar object or create one if not found */
 $ = window.jQuery || window.$ || (window.$ = {}),
@@ -58,7 +61,7 @@
 };
 
 // Break if no JSON support was found
-if (!('parse' in JSON) || !('stringify' in JSON)) {
+if (typeof JSON.parse !== 'function' || typeof JSON.stringify !== 
'function') {
 throw new Error('No JSON support found, include 
//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js to page');
 }
 
@@ -536,14 +539,19 @@
 return;
 }
 var pubelm,
-_pubsubCurrent = _pubsub_last;
+_pubsubCurrent = _pubsub_last,
+needFired = [];
 
 for (i = len = _storage.__jstorage_meta.PubSub.length - 1; i >= 0; 
i--) {
 pubelm = _storage.__jstorage_meta.PubSub[i];
 if (pubelm[0] > _pubsub_last) {
 _pubsubCurrent = pubelm[0];
-_fireSubscribers(pubelm[1], pubelm[2]);
+needFired.unshift(pubelm);
 }
+}
+
+for (i = needFired.length - 1; i >= 0; i--) {
+_fireSubscribers(needFired[i][1], needFired[i][2]);
 }
 
 _pubsub_last = _pubsubCurrent;
@@ -653,8 +661,10 @@
 switch (l) {
 case 3:
 h ^= (str.charCodeAt(i + 2) & 0xff) << 16;
+/* falls through */
 case 2:
 h ^= (str.charCodeAt(i + 1) & 0xff) << 8;
+/* falls through */
 case 1:
 h ^= (str.charCodeAt(i) & 0xff);
 h = (((h & 0x) * 0x5bd1e995) + h >>> 16) * 0x5bd1e995) 
& 0x) << 16));
@@ -983,4 +993,4 @@
 // Initialize jStorage
 _init();
 
-})();
\ No newline at end of file
+})();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62899c8a2a7b9b2ae5b0f4b6ec06ee24cb966806
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] RequestContextTest: Distinguish initial test from restored test - change (mediawiki/core)

2014-10-14 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166712

Change subject: RequestContextTest: Distinguish initial test from restored test
..

RequestContextTest: Distinguish initial test from restored test

Follows-up f31a046. In failure it's hard to see whether it's the
first or third group of assertions as they were carying the same
name.

Change-Id: I5891754342400155759e797337f8509d4eca39ec
---
M tests/phpunit/includes/RequestContextTest.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/166712/1

diff --git a/tests/phpunit/includes/RequestContextTest.php 
b/tests/phpunit/includes/RequestContextTest.php
index cae0e52..a9e5be2 100644
--- a/tests/phpunit/includes/RequestContextTest.php
+++ b/tests/phpunit/includes/RequestContextTest.php
@@ -88,9 +88,9 @@
unset( $sc ); // restore previous context
 
$info = $context->exportSession();
-   $this->assertEquals( $oInfo['ip'], $info['ip'], "Correct 
initial IP address." );
-   $this->assertEquals( $oInfo['headers'], $info['headers'], 
"Correct initial headers." );
-   $this->assertEquals( $oInfo['sessionId'], $info['sessionId'], 
"Correct initial session ID." );
-   $this->assertEquals( $oInfo['userId'], $info['userId'], 
"Correct initial user ID." );
+   $this->assertEquals( $oInfo['ip'], $info['ip'], "Correct 
restored IP address." );
+   $this->assertEquals( $oInfo['headers'], $info['headers'], 
"Correct restored headers." );
+   $this->assertEquals( $oInfo['sessionId'], $info['sessionId'], 
"Correct restored session ID." );
+   $this->assertEquals( $oInfo['userId'], $info['userId'], 
"Correct restored user ID." );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5891754342400155759e797337f8509d4eca39ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Only hide newtopic_form fields on a Flow board - change (mediawiki...Flow)

2014-10-14 Thread Spage (Code Review)

Spage has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166711

Change subject: Only hide newtopic_form fields on a Flow board
..

Only hide newtopic_form fields on a Flow board

They were display:none on the standalone action=newtopic page, breaking
it for no-JS users.

Bug:72064
Change-Id: I4cd4570eb5a18d5a28f6190989d854fe23c150b2
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_lock.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/flow_block_topiclist.handlebars
M handlebars/flow_newtopic_form.handlebars
6 files changed, 18 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/11/166711/1

diff --git a/handlebars/compiled/flow_block_topic.handlebars.php 
b/handlebars/compiled/flow_block_topic.handlebars.php
index 1de070e..f18961b 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -129,7 +129,7 @@


'.((LCRun3::ifvar($cx, 
((is_array($in['actions']) && isset($in['actions']['edit'])) ? 
$in['actions']['edit'] : null))) ? '
-   
+   

' : '').'
'.((LCRun3::ifvar($cx, 
((is_array($in['actions']) && isset($in['actions']['summarize'])) ? 
$in['actions']['summarize'] : null))) ? '
-   
+   

'.((LCRun3::ifvar($cx, 
((is_array($cx['scopes'][0]['submitted']) && 
isset($cx['scopes'][0]['submitted']['reason'])) ? 
$cx['scopes'][0]['submitted']['reason'] : null))) ? 
''.htmlentities(((is_array($cx['scopes'][0]['submitted']) && 
isset($cx['scopes'][0]['submitted']['reason'])) ? 
$cx['scopes'][0]['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'' : 
'').'


-   '.'

+   '.'

'.LCRun3::ch($cx, 'l10n', 
Array(Array('flow-newtopic-start-placeholder'),Array()), 'encq').'
@@ -132,11 +132,11 @@

 

+   '.((LCRun3::ifvar($cx, ((is_array($in) && 
isset($in['isOnFlowBoard'])) ? $in['isOnFlowBoard'] : null))) ? 
'style="display:none;"' : '').'>
'.LCRun3::ch($cx, 'l10n', 
Array(Array('flow-newtopic-save'),Array()), 'encq').'
@@ -159,7 +159,7 @@


 ' : '').'
-
+}


 
@@ -618,4 +618,4 @@
 
 ';
 }
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php 
b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
index 1333694..aaae9c1 100644
--- a/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
@@ -65,11 +65,11 @@

 

+   '.((LCRun3::ifvar($cx, ((is_array($in) && 
isset($in['isOnFlowBoard'])) ? $in['isOnFlowBoard'] : null))) ? 
'style="display:none;"' : '').'>
'.LCRun3::ch($cx, 'l10n', 
Array(Array('flow-newtopic-save'),Array()), 'encq').'
diff --git a/handlebars/flow_block_topiclist.handlebars 
b/handlebars/flow_block_topiclist.handlebars
index 8876882..c9bf95d 100644
--- a/handlebars/flow_block_topiclist.handlebars
+++ b/handlebars/flow_block_topiclist.handlebars
@@ -1,15 +1,15 @@
 {{> flow_board_navigation}}
 
 
-   {{! new-topic form should only be displayed when run with JS, otherwise 
link to designated page }}

+   {{! No-JS gets a link to separate page with newtopic form }}

{{l10n 
"flow-newtopic-start-placeholder"}}

 

-   {{> flow_newtopic_form}}
+   {{> flow_newtopic_form isOnFlowBoard=true }}}


 
diff --git a/handlebars/flow_newtopic_form.handlebars 
b/handlebars/flow_newtopic_form.handlebars
index bc75ecb..a798e70 100644
--- a/handlebars/flow_newtopic_form.handlebars
+++ b/handlebars/flow_newtopic_form.handlebars
@@ -14,11 +14,11 @@

 

+   {{#if isOnFlowBoard}}style="display:none;"{{/if}}>
{{l10n "flow-newtopic-save"}}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cd4570eb5a18d5a28f6190989d854fe23c150b2
Gerrit-PatchSet

[MediaWiki-commits] [Gerrit] ssl_ciphersuite - add new compat mode - change (operations/puppet)

2014-10-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166710

Change subject: ssl_ciphersuite - add new compat mode
..

ssl_ciphersuite - add new compat mode

add a new compatibility mode besides
the existing

"compat" (which doesn't disable SSLv3)
"strong" (requires Apache 2.4)

called "compatnossl" (yea, give me a better one)
that is like compat so it can work on 2.2
but still disables SSL3

then, use it on ytterbium, for gerrit

Change-Id: I0cff61a2d86060e8c3bd6197eeb5666fee3168dc
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/166710/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb 
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index bbd0d59..a3c0df7 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -48,6 +48,7 @@
 module Puppet::Parser::Functions
   ciphersuites = {
 'compat' => 
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH',
+'compatnossl' => 
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH',
 'strong' => 
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH'
   }
   newfunction(
@@ -65,6 +66,7 @@
 
ssl_ciphersuite('apache-2.4', 'compat') # Compatible config for apache 2.4
ssl_ciphersuite('nginx', 'strong', '365') # PFS-only, use HSTS for 365 days
+   ssl_ciphersuite('apache-2.2', 'compatnossl') # Compatible config for apache 
2.2 but don't allow SSL3
 END
   ) do |args|
 
@@ -112,6 +114,8 @@
 output.push('SSLProtocol all -SSLv2 -SSLv3 -TLSv1')
   when 'compat' then
 output.push('SSLProtocol all -SSLv2')
+  when 'compatnossl' then
+output.push('SSLProtocol all -SSLv2 -SSLv3')
   end
   output.push("SSLCipherSuite #{cipherlist}")
   output.push('SSLHonorCipherOrder On')
@@ -126,6 +130,8 @@
 output.push('ssl_protocols TLSv1.1 TLSv1.2;')
   when 'compat' then
 output.push('ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;')
+  when 'compatnossl' then
+output.push('ssl_protocols TLSv1 TLSv1.1 TLSv1.2;')
   end
   output.push("ssl_ciphers #{cipherlist};")
   output.push('ssl_prefer_server_ciphers on;')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cff61a2d86060e8c3bd6197eeb5666fee3168dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] Put category popups in the inner overlay for now - change (mediawiki...VisualEditor)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Put category popups in the inner overlay for now
..


Put category popups in the inner overlay for now

We really shouldn't need the inner overlay for this,
we should be able to deal with popups being in
oo-ui-window-overlay. But for now, we're not, and
this fixes the current problems.

Depends on If16d16d2b in oojs-ui.

Bug: 72052
Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
(cherry picked from commit 267212c531969bdf7b7c7a578f85c51f8c3bc737)
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index de4c4a1..fbc28b3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -77,7 +77,8 @@
'categories',
{
$: this.$,
-   $overlay: this.$overlay
+   $overlay: this.$overlay,
+   $popupOverlay: this.$innerOverlay
}
);
this.languagesPage = new ve.ui.MWLanguagesPage(
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 373ae7a..b93c686 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -14,7 +14,8 @@
  * @constructor
  * @param {string} name Unique symbolic name of page
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$overlay] Overlay to render category settings popups in
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) {
// Configuration initialization
@@ -38,7 +39,7 @@
icon: 'settings'
} );
this.categoryWidget = new ve.ui.MWCategoryWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$overlay, $popupOverlay: 
config.$popupOverlay
} );
this.defaultSortInput = new OO.ui.TextInputWidget( {
$: this.$, placeholder: this.fallbackDefaultSortKey
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index a321b24..ddfa24e 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -15,6 +15,8 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoryWidget = function VeUiMWCategoryWidget( config ) {
// Config intialization
@@ -32,7 +34,7 @@
this.popupState = false;
this.savedPopupState = false;
this.popup = new ve.ui.MWCategoryPopupWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$popupOverlay
} );
this.input = new ve.ui.MWCategoryInputWidget( this, {
$: this.$, $overlay: config.$overlay

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (d74a46ca6a) - change (mediawiki/core)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a)
..


Update OOjs UI to v0.1.0-pre (d74a46ca6a)

New changes:
d74a46c Introduce oo-ui-window-inner-overlay

Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui-minerva.css
M resources/lib/oojs-ui/oojs-ui-minerva.js
M resources/lib/oojs-ui/oojs-ui-minerva.svg.css
M resources/lib/oojs-ui/oojs-ui.js
10 files changed, 41 insertions(+), 33 deletions(-)

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



diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css 
b/resources/lib/oojs-ui/oojs-ui-apex.css
index a8f1e8e..42e6699 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 3835239..ba1ef86 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:29Z
+ * Date: 2014-10-15T00:40:17Z
  */
 /* Instantiation */
 
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css 
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 8a70e54..06880ff 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index f18c048..7fbd762 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1421,7 +1421,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1456,7 +1457,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 9c1ca57..8fed983 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 20

[MediaWiki-commits] [Gerrit] Remove deployment::target - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Remove deployment::target
..


Remove deployment::target

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: I72adfd37d3023173560b16ce71ef8c6a644a6c4b
---
D modules/deployment/manifests/target.pp
1 file changed, 0 insertions(+), 41 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved

Objections:
  BryanDavis: There's a problem with this change, please improve



diff --git a/modules/deployment/manifests/target.pp 
b/modules/deployment/manifests/target.pp
deleted file mode 100644
index d828e1d..000
--- a/modules/deployment/manifests/target.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-define deployment::target($ensure=present) {
-# Need packages before deploy.sync_all
-# is run.  (git, git-fat, etc.)
-require deployment::packages
-
-salt::grain { "deployment_target_${name}":
-ensure => $ensure,
-grain  => 'deployment_target',
-value  => $name,
-notify => [
-Exec['deployment_target_sync_all'],
-Exec['deployment_target_refresh_pillars'],
-Exec['deployment_target_deploy_all'],
-];
-}
-if ! defined(Exec['deployment_target_sync_all']){
-exec { 'deployment_target_sync_all':
-refreshonly => true,
-path=> ['/usr/bin'],
-command => 'salt-call saltutil.sync_all';
-}
-}
-if ! defined(Exec['deployment_target_refresh_pillars']){
-exec { 'deployment_target_refresh_pillars':
-refreshonly => true,
-path=> ['/usr/bin'],
-command => 'salt-call saltutil.refresh_pillar';
-}
-}
-if ! defined(Exec['deployment_target_deploy_all']){
-exec { 'deployment_target_deploy_all':
-refreshonly => true,
-path=> ['/usr/bin'],
-command => 'salt-call deploy.sync_all',
-require => [
-Exec['deployment_target_sync_all'],
-Exec['deployment_target_refresh_pillars'],
-];
-}
-}
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72adfd37d3023173560b16ce71ef8c6a644a6c4b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (d74a46ca6a) - change (VisualEditor/VisualEditor)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a)
..


Update OOjs UI to v0.1.0-pre (d74a46ca6a)

New changes:
d74a46c Introduce oo-ui-window-inner-overlay

Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd
---
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui-minerva.css
M lib/oojs-ui/oojs-ui-minerva.js
M lib/oojs-ui/oojs-ui-minerva.rtl.css
M lib/oojs-ui/oojs-ui-minerva.svg.css
M lib/oojs-ui/oojs-ui-minerva.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
16 files changed, 71 insertions(+), 57 deletions(-)

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



diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index e0773bc..07b5727 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index e2ef0b2..dfb78de 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:42Z
+ * Date: 2014-10-15T00:38:31Z
  */
 /* Instantiation */
 
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 5f68597..9114635 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
right: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css
index 07a73b4..d0f54f1 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css 
b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
index b8328c7..afff384 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Release

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (d74a46ca6a) - change (mediawiki/core)

2014-10-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166708

Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a)
..

Update OOjs UI to v0.1.0-pre (d74a46ca6a)

New changes:
d74a46c Introduce oo-ui-window-inner-overlay

Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui-minerva.css
M resources/lib/oojs-ui/oojs-ui-minerva.js
M resources/lib/oojs-ui/oojs-ui-minerva.svg.css
M resources/lib/oojs-ui/oojs-ui.js
10 files changed, 41 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/166708/1

diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css 
b/resources/lib/oojs-ui/oojs-ui-apex.css
index a8f1e8e..42e6699 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 3835239..ba1ef86 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:29Z
+ * Date: 2014-10-15T00:40:17Z
  */
 /* Instantiation */
 
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css 
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 8a70e54..06880ff 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index f18c048..7fbd762 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1421,7 +1421,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1456,7 +1457,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 9c1ca57..8fed983 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.medi

[MediaWiki-commits] [Gerrit] Put category popups in the inner overlay for now - change (mediawiki...VisualEditor)

2014-10-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166709

Change subject: Put category popups in the inner overlay for now
..

Put category popups in the inner overlay for now

We really shouldn't need the inner overlay for this,
we should be able to deal with popups being in
oo-ui-window-overlay. But for now, we're not, and
this fixes the current problems.

Depends on If16d16d2b in oojs-ui.

Bug: 72052
Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
(cherry picked from commit 267212c531969bdf7b7c7a578f85c51f8c3bc737)
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
3 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/09/166709/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index de4c4a1..fbc28b3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -77,7 +77,8 @@
'categories',
{
$: this.$,
-   $overlay: this.$overlay
+   $overlay: this.$overlay,
+   $popupOverlay: this.$innerOverlay
}
);
this.languagesPage = new ve.ui.MWLanguagesPage(
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 373ae7a..b93c686 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -14,7 +14,8 @@
  * @constructor
  * @param {string} name Unique symbolic name of page
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$overlay] Overlay to render category settings popups in
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) {
// Configuration initialization
@@ -38,7 +39,7 @@
icon: 'settings'
} );
this.categoryWidget = new ve.ui.MWCategoryWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$overlay, $popupOverlay: 
config.$popupOverlay
} );
this.defaultSortInput = new OO.ui.TextInputWidget( {
$: this.$, placeholder: this.fallbackDefaultSortKey
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index a321b24..ddfa24e 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -15,6 +15,8 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoryWidget = function VeUiMWCategoryWidget( config ) {
// Config intialization
@@ -32,7 +34,7 @@
this.popupState = false;
this.savedPopupState = false;
this.popup = new ve.ui.MWCategoryPopupWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$popupOverlay
} );
this.input = new ve.ui.MWCategoryInputWidget( this, {
$: this.$, $overlay: config.$overlay

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (d74a46ca6a) - change (mediawiki/core)

2014-10-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166707

Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a)
..

Update OOjs UI to v0.1.0-pre (d74a46ca6a)

New changes:
d74a46c Introduce oo-ui-window-inner-overlay

Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui-minerva.css
M resources/lib/oojs-ui/oojs-ui-minerva.js
M resources/lib/oojs-ui/oojs-ui-minerva.svg.css
M resources/lib/oojs-ui/oojs-ui.js
10 files changed, 41 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/166707/1

diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css 
b/resources/lib/oojs-ui/oojs-ui-apex.css
index a8f1e8e..42e6699 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 3835239..ba1ef86 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:29Z
+ * Date: 2014-10-15T00:40:17Z
  */
 /* Instantiation */
 
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css 
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 8a70e54..06880ff 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index f18c048..7fbd762 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:05:40Z
+ * Date: 2014-10-15T00:40:28Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1421,7 +1421,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1456,7 +1457,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 9c1ca57..8fed983 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.medi

[MediaWiki-commits] [Gerrit] role::ci::slave: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: role::ci::slave: Convert to package<|provider==trebuchet|>
..


role::ci::slave: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: I72c9b25d9aa2a4d21aaae8a14802b48de2480b96
---
M manifests/role/ci.pp
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 157ef11..662b6d9 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -123,7 +123,17 @@
 include role::gerrit::production::replicationdest
 include role::zuul::install
 
-deployment::target { 'contint-production-slaves': }
+package {
+[
+'integration/kss',
+'integration/mediawiki-tools-codesniffer',
+'integration/phpunit',
+'integration/phpcs',
+'integration/php-coveralls',
+'integration/slave-scripts',
+]:
+provider => 'trebuchet',
+}
 
 class { 'jenkins::slave':
 ssh_authorized_key => 
'B3NzaC1yc2EBIwAAAQEA4QGc1Zs/S4s7znEYw7RifTuZ4y4iYvXl5jp5tJA9kGUGzzfL0dc4ZEEhpu+4C/TixZJXqv0N6yke67cM8hfdXnLOVJc4n/Z02uYHQpRDeLAJUAlGlbGZNvzsOLw39dGF0u3YmwDm6rj85RSvGqz8ExbvrneCVJSaYlIRvOEKw0e0FYs8Yc7aqFRV60M6fGzWVaC3lQjSnEFMNGdSiLp3Vl/GB4GgvRJpbNENRrTS3Te9BPtPAGhJVPliTflVYvULCjYVtPEbvabkW+vZznlcVHAZJVTTgmqpDZEHqp4bzyO8rBNhMc7BjUVyNVNC5FCk+D2LagmIriYxjirXDNrWlw==',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72c9b25d9aa2a4d21aaae8a14802b48de2480b96
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (d74a46ca6a) - change (VisualEditor/VisualEditor)

2014-10-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166706

Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a)
..

Update OOjs UI to v0.1.0-pre (d74a46ca6a)

New changes:
d74a46c Introduce oo-ui-window-inner-overlay

Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd
---
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui-minerva.css
M lib/oojs-ui/oojs-ui-minerva.js
M lib/oojs-ui/oojs-ui-minerva.rtl.css
M lib/oojs-ui/oojs-ui-minerva.svg.css
M lib/oojs-ui/oojs-ui-minerva.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
16 files changed, 71 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/06/166706/1

diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index e0773bc..07b5727 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index e2ef0b2..dfb78de 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:42Z
+ * Date: 2014-10-15T00:38:31Z
  */
 /* Instantiation */
 
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 5f68597..9114635 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
right: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css
index 07a73b4..d0f54f1 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2014-10-11T01:06:53Z
+ * Date: 2014-10-15T00:38:42Z
  */
 /* @noflip */
 .oo-ui-rtl {
@@ -1599,7 +1599,8 @@
padding: 0;
background: none;
 }
-.oo-ui-window-overlay {
+.oo-ui-window-overlay,
+.oo-ui-window-inner-overlay {
position: absolute;
top: 0;
left: 0;
@@ -1635,7 +1636,7 @@
z-index: 1;
bottom: 0;
 }
-.oo-ui-dialog-content > .oo-ui-window-overlay {
+.oo-ui-dialog-content > .oo-ui-window-inner-overlay {
z-index: 3;
 }
 .oo-ui-dialog-content > .oo-ui-window-body {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css 
b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
index b8328c7..afff384 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (837b2f733e)
+ * OOjs UI v0.1.0-pre (d74a46ca6a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2

[MediaWiki-commits] [Gerrit] role::analytics: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: role::analytics: Convert to package<|provider==trebuchet|>
..


role::analytics: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: I467d3c99aead38a6b601a7eda834fdfb57cf2f26
---
M manifests/role/analytics/kraken.pp
M manifests/role/analytics/refinery.pp
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Filippo Giunchedi: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/role/analytics/kraken.pp 
b/manifests/role/analytics/kraken.pp
index 7594870..e390cec 100644
--- a/manifests/role/analytics/kraken.pp
+++ b/manifests/role/analytics/kraken.pp
@@ -28,7 +28,9 @@
 }
 
 # Include kraken/deploy repository target.
-deployment::target { 'analytics-kraken-deploy': }
+package { 'analytics/kraken/deploy':
+provider => 'trebuchet',
+}
 # kraken/deploy repository is deployed via git deploy into here.
 # You must deploy this yourself, puppet will not do it for you.
 $path = '/srv/deployment/analytics/kraken/deploy/kraken'
diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index 58e613f..2db7b20 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -17,7 +17,9 @@
 }
 
 # analytics/refinery will deployed to this node.
-deployment::target { 'analytics-refinery': }
+package { 'analytics/refinery':
+provider => 'trebuchet',
+}
 
 # analytics/refinery repository is deployed via git-deploy at this path.
 # You must deploy this yourself; puppet will not do it for you.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I467d3c99aead38a6b601a7eda834fdfb57cf2f26
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] role::elasticsearch: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: role::elasticsearch: Convert to package<|provider==trebuchet|>
..


role::elasticsearch: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: Ie96a730b7771a9be738260ec01fe663c91ae7a75
---
M manifests/role/elasticsearch.pp
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Filippo Giunchedi: Looks good to me, but someone else must approve



diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index b228ca6..09f1e5f 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -118,7 +118,9 @@
 description => 'elasticsearch server',
 }
 
-deployment::target { 'elasticsearchplugins': }
+package { 'elasticsearch/plugins':
+provider => 'trebuchet',
+}
 
 # Install
 class { '::elasticsearch':
@@ -143,7 +145,7 @@
 # get elasticsearch up and running.  Once for the initial
 # node configuration (including salt), and then once again
 # after you have signed this node's new salt key over on the salt 
master.
-require=> 
Deployment::Target['elasticsearchplugins'],
+require=> Package['elasticsearch/plugins'],
 bulk_thread_pool_capacity  => $bulk_thread_pool_capacity,
 bulk_thread_pool_executors => $bulk_thread_pool_executors,
 graphite_host  => $graphite_host,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie96a730b7771a9be738260ec01fe663c91ae7a75
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't use deprecated efLogServerSideEvent - change (mediawiki...CentralAuth)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Don't use deprecated efLogServerSideEvent
..


Don't use deprecated efLogServerSideEvent

Change-Id: I00c20bac4410e4393b63c64b99c41562d44baf22
---
M includes/CentralAuthHooks.php
M includes/specials/SpecialCentralAutoLogin.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 5672155..0679a14 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1351,7 +1351,7 @@
 
if ( $wgCentralAuthUseEventLogging ) {
// Need to correlate user_id across 
wikis
-   efLogServerSideEvent( 'CentralAuth', 
5690875,
+   EventLogging::logEvent( 'CentralAuth', 
5690875,
array( 'version' => 1,
'userId' => 
$centralUser->getId(),
'action' => 
'sul2-autologin-login'
diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 22d2ac8..1b896b5 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -441,7 +441,7 @@
// Otherwise, we need to rewrite p-personal and maybe 
notify the user too
global $wgCentralAuthUseEventLogging;
if ( $wgCentralAuthUseEventLogging ) {
-   efLogServerSideEvent( 'CentralAuth', 5690875,
+   EventLogging::logEvent( 'CentralAuth', 5690875,
array( 'version' => 1,
'userId' => 
$centralUser->getId(),
'action' => 
'sul2-autologin-fallbacklogin'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00c20bac4410e4393b63c64b99c41562d44baf22
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [POC] Basic extension registration from an extension.json file - change (mediawiki/core)

2014-10-14 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166705

Change subject: [POC] Basic extension registration from an extension.json file
..

[POC] Basic extension registration from an extension.json file

Had to move up the loading of GlobalFunctions so it is usable
from LocalSettings.php

Change-Id: I7074b65d07c5c7d4e3f1fb0755d74a0b07ed4596
---
M includes/AutoLoader.php
A includes/ExtensionRegistrerer.php
M includes/GlobalFunctions.php
M includes/Setup.php
M includes/WebStart.php
M maintenance/doMaintenance.php
6 files changed, 142 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/166705/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index cd6a8ca..012c70a 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -69,6 +69,7 @@
'DumpPipeOutput' => 'includes/Export.php',
'EditPage' => 'includes/EditPage.php',
'EmptyBloomCache' => 'includes/cache/bloom/BloomCache.php',
+   'ExtensionRegistrerer' => 'includes/ExtensionRegistrerer.php',
'Fallback' => 'includes/Fallback.php',
'FauxRequest' => 'includes/WebRequest.php',
'FauxResponse' => 'includes/WebResponse.php',
diff --git a/includes/ExtensionRegistrerer.php 
b/includes/ExtensionRegistrerer.php
new file mode 100644
index 000..9b720ff
--- /dev/null
+++ b/includes/ExtensionRegistrerer.php
@@ -0,0 +1,128 @@
+configFactory = $configFactory;
+   // Setup APC caching if possible, otherwise just skip it
+   try {
+   $this->cache = wfGetCache( CACHE_ACCEL );
+   } catch ( MWException $e ) {
+   $this->cache = new EmptyBagOStuff();
+   }
+   }
+
+   /**
+* @param string $filename
+* @param int $mtime
+* @return array
+*/
+   public function loadExtensionInfoFromFile( $filename, $mtime ) {
+   $key = wfMemcKey( 'extreg', md5( $filename ) );
+   $cached = $this->cache->get( $key );
+   if ( isset( $cached['mtime'] ) && $cached['mtime'] === $mtime ) 
{
+   return $cached['info'];
+   }
+
+   $contents = file_get_contents( $filename );
+   $json = json_decode( $contents );
+   if ( is_object( $json ) ) {
+   $json = wfObjectToArray( $json );
+   $this->cache->set( $key, array( 'mtime' => $mtime, 
'info' => $json ) );
+   } else {
+   // Don't throw an error here, but don't cache it either.
+   $json = array();
+   }
+
+   return $json;
+   }
+
+   /**
+* @param string $name
+* @param string|null $path
+* @return array
+*/
+   private function getPathAndMTime( $name, $path = null ) {
+   if ( !$path ) {
+   global $IP;
+   $path = "$IP/extensions";
+   }
+   $fullpath = $path . DIRECTORY_SEPARATOR . $name . 
DIRECTORY_SEPARATOR . "extension.json";
+   $mtime = filemtime( $fullpath );
+   return array( $fullpath, $mtime );
+   }
+
+   public function loadExtension( $name, $path = null ) {
+   list( $fullpath, $mtime ) = $this->getPathAndMTime( $name, 
$path );
+   $info = $this->loadExtensionInfoFromFile( $fullpath, $mtime );
+   //var_dump("Loading $name" );
+   $this->processInfo( $name, $info );
+
+   }
+
+   protected function processInfo( $name, $info ) {
+   $this->setCredits( $info );
+   foreach ( $info as $key => $val ) {
+   if ( $key === 'config' ) {
+   $this->registerConfig( $name, $val );
+   } else {
+   $this->setToGlobal( $key, $val );
+   }
+   }
+   }
+
+   protected function setCredits( &$info ) {
+   $attrs = array(
+   'name',
+   'type',
+   'authors',
+   'path',
+   'version',
+   'url',
+   'description',
+   'descriptionmsg',
+   'license-name',
+   );
+   $credits = array();
+   foreach ( $attrs as $attr ) {
+   if ( isset( $info[$attr] ) ) {
+   $credits[$attr] = $info[$attr];
+   unset( $info[$attr] );
+   }
+   }
+
+   $GLOBALS['wgExtensionCredits'][] = $credits;
+   }
+
+   protected function setToGlobal( $global, $value ) {
+   $GLOBAL

[MediaWiki-commits] [Gerrit] [POC] Add extension.json file - change (mediawiki...AntiSpoof)

2014-10-14 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166704

Change subject: [POC] Add extension.json file
..

[POC] Add extension.json file

Change-Id: I5effc00a11426e7fe9c0d3df69f99e9b761cd7e6
---
A extension.json
1 file changed, 65 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof 
refs/changes/04/166704/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..6518762
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,65 @@
+{
+   "name": "AntiSpoof",
+   "type": "antispam",
+   "url": "https://www.mediawiki.org/wiki/Extension:AntiSpoof";,
+   "authors": [
+   "Brion Vibber"
+   ],
+   "descriptionmsg": "antispoof-desc",
+   "config": {
+   "AntiSpoofAccounts": true,
+   "AntiSpoofBlacklist": [
+   "\u0337",
+   "\u0338",
+   "\u2044",
+   "\u2215",
+   "\u23AE",
+   "\u29F6",
+   "\u29F8",
+   "\u2AFB",
+   "\u2AFD",
+   "\uFF0F"
+   ]
+   },
+   "GroupPermissions": {
+   "sysop": {
+   "override-antispoof": true
+   },
+   "bureaucrat": {
+   "override-antispoof": true
+   }
+   },
+   "AvailableRights": [
+   "override-antispoof"
+   ],
+   "MessagesDirs": ["i18n"],
+   "AutoloadClasses": {
+   "AntiSpoof": "AntiSpoof_body.php",
+   "AntiSpoofHooks": "AntiSpoofHooks.php",
+   "SpoofUser": "SpoofUser.php",
+   "ApiAntiSpoof": "api/ApiAntiSpoof.php"
+   },
+   "APIModules": {
+   "antispoof": "ApiAntiSpoof"
+   },
+   "Hooks": {
+   "LoadExtensionSchemaUpdates": [
+   "AntiSpoofHooks::asUpdateSchema"
+   ],
+   "AbortNewAccount": [
+   "AntiSpoofHooks::asAbortNewAccountHook"
+   ],
+   "UserCreateForm": [
+   "AntiSpoofHooks::asUserCreateFormHook"
+   ],
+   "AddNewAccount": [
+   "AntiSpoofHooks::asAddNewAccountHook"
+   ],
+   "RenameUserComplete": [
+   "AntiSpoofHooks::asAddRenameUserHook"
+   ],
+   "UnitTestsList": [
+   "AntiSpoofHooks::asUnitTestsList"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5effc00a11426e7fe9c0d3df69f99e9b761cd7e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] role::parsoid: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: role::parsoid: Convert to package<|provider==trebuchet|>
..


role::parsoid: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: I4b70be2403388a30d11cba8ad97a82304eed7a14
---
M manifests/role/parsoid.pp
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2084cc7..648d366 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -35,7 +35,9 @@
 
 include role::parsoid::common
 
-deployment::target { 'parsoid': }
+package { 'parsoid/deploy':
+provider => 'trebuchet',
+}
 
 group { 'parsoid':
 ensure => present,
@@ -110,6 +112,7 @@
 File['/etc/default/parsoid'],
 File['/etc/init/parsoid.conf'],
 ],
+require=> Package['parsoid/deploy'],
 }
 
 monitor_service { 'parsoid':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b70be2403388a30d11cba8ad97a82304eed7a14
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Introduce oo-ui-window-inner-overlay - change (oojs/ui)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Introduce oo-ui-window-inner-overlay
..


Introduce oo-ui-window-inner-overlay

This is another overlay placed where oo-ui-window-overlay
used to be before it was moved up.

This is a temporary measure and I look forward to killing it
with fire.

Change-Id: If16d16d2b2c926962b0e3be7a72d3f6022ace700
---
M src/Window.js
M src/styles/Dialog.less
M src/styles/Window.less
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/src/Window.js b/src/Window.js
index 651726d..361337f 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -543,6 +543,7 @@
this.$head = this.$( '' );
this.$body = this.$( '' );
this.$foot = this.$( '' );
+   this.$innerOverlay = this.$( '' );
 
// Events
this.$element.on( 'mousedown', OO.ui.bind( this.onMouseDown, this ) );
@@ -551,7 +552,8 @@
this.$head.addClass( 'oo-ui-window-head' );
this.$body.addClass( 'oo-ui-window-body' );
this.$foot.addClass( 'oo-ui-window-foot' );
-   this.$content.append( this.$head, this.$body, this.$foot );
+   this.$innerOverlay.addClass( 'oo-ui-window-inner-overlay' );
+   this.$content.append( this.$head, this.$body, this.$foot, 
this.$innerOverlay );
 
return this;
 };
diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index f4bc29a..b2dd184 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -29,7 +29,7 @@
bottom: 0;
}
 
-   &-overlay {
+   &-inner-overlay {
z-index: 3;
}
}
diff --git a/src/styles/Window.less b/src/styles/Window.less
index c3b8728..586147f 100644
--- a/src/styles/Window.less
+++ b/src/styles/Window.less
@@ -30,7 +30,8 @@
background: none;
}
 
-   &-overlay {
+   &-overlay,
+   &-inner-overlay {
position: absolute;
top: 0;
left: 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If16d16d2b2c926962b0e3be7a72d3f6022ace700
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0436c01..1b6a234 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 0436c01..1b6a234
..


Syncronize VisualEditor: 0436c01..1b6a234

Change-Id: I88e85c929ce5020083b09e67319d95faca75f6ff
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 0436c01..1b6a234 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0436c0148992cf168ab43db2085763169fca1355
+Subproject commit 1b6a234d09bfd0954dbaeb1b5db26369707f5653

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88e85c929ce5020083b09e67319d95faca75f6ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0436c01..1b6a234 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166703

Change subject: Syncronize VisualEditor: 0436c01..1b6a234
..

Syncronize VisualEditor: 0436c01..1b6a234

Change-Id: I88e85c929ce5020083b09e67319d95faca75f6ff
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/03/166703/1

diff --git a/VisualEditor b/VisualEditor
index 0436c01..1b6a234 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0436c0148992cf168ab43db2085763169fca1355
+Subproject commit 1b6a234d09bfd0954dbaeb1b5db26369707f5653

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88e85c929ce5020083b09e67319d95faca75f6ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Put category popups in the inner overlay for now - change (mediawiki...VisualEditor)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Put category popups in the inner overlay for now
..


Put category popups in the inner overlay for now

We really shouldn't need the inner overlay for this,
we should be able to deal with popups being in
oo-ui-window-overlay. But for now, we're not, and
this fixes the current problems.

Depends on If16d16d2b in oojs-ui.

Bug: 72052
Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index de4c4a1..fbc28b3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -77,7 +77,8 @@
'categories',
{
$: this.$,
-   $overlay: this.$overlay
+   $overlay: this.$overlay,
+   $popupOverlay: this.$innerOverlay
}
);
this.languagesPage = new ve.ui.MWLanguagesPage(
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 373ae7a..b93c686 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -14,7 +14,8 @@
  * @constructor
  * @param {string} name Unique symbolic name of page
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$overlay] Overlay to render category settings popups in
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) {
// Configuration initialization
@@ -38,7 +39,7 @@
icon: 'settings'
} );
this.categoryWidget = new ve.ui.MWCategoryWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$overlay, $popupOverlay: 
config.$popupOverlay
} );
this.defaultSortInput = new OO.ui.TextInputWidget( {
$: this.$, placeholder: this.fallbackDefaultSortKey
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index b432f37..310dc27 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -15,6 +15,8 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoryWidget = function VeUiMWCategoryWidget( config ) {
// Config intialization
@@ -32,7 +34,7 @@
this.popupState = false;
this.savedPopupState = false;
this.popup = new ve.ui.MWCategoryPopupWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$popupOverlay
} );
this.input = new ve.ui.MWCategoryInputWidget( this, {
$: this.$, $overlay: config.$overlay

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ocg: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: ocg: Convert to package<|provider==trebuchet|>
..


ocg: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: Ic2de6aa63a129fad6687a21acca12ed59404f85d
---
M modules/ocg/manifests/decommission.pp
M modules/ocg/manifests/init.pp
2 files changed, 11 insertions(+), 5 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ocg/manifests/decommission.pp 
b/modules/ocg/manifests/decommission.pp
index e03783f..1477ffd 100644
--- a/modules/ocg/manifests/decommission.pp
+++ b/modules/ocg/manifests/decommission.pp
@@ -51,8 +51,9 @@
 ensure  => absent,
 }
 
-deployment::target { 'ocg':
-ensure  => absent,
-require => Service['ocg'],
+package { 'ocg/ocg':
+ensure   => absent,
+provider => 'trebuchet',
+require  => Service['ocg'],
 }
 }
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index e543320..d1dea30 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -25,7 +25,9 @@
 $output_dir = '/srv/deployment/ocg/output',
 $postmortem_dir = '/srv/deployment/ocg/postmortem'
 ) {
-deployment::target { 'ocg': }
+package { 'ocg/ocg':
+provider => 'trebuchet',
+}
 
 group { 'ocg':
 ensure => present,
@@ -103,7 +105,10 @@
 provider   => upstart,
 hasstatus  => false,
 hasrestart => false,
-require=> File['/etc/init/ocg.conf'],
+require=> [
+File['/etc/init/ocg.conf'],
+Package['ocg/ocg'],
+],
 }
 
 file { '/etc/ocg':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2de6aa63a129fad6687a21acca12ed59404f85d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] role::performance: Convert to package<|provider==trebuchet|> - change (operations/puppet)

2014-10-14 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: role::performance: Convert to package<|provider==trebuchet|>
..


role::performance: Convert to package<|provider==trebuchet|>

The deployment::target resource has been deprecated in favor of
Trebuchet's custom provider.

Change-Id: I955029c77538e970331f26c9f80143515bfa5e69
---
M manifests/role/performance.pp
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/performance.pp b/manifests/role/performance.pp
index 29021c6..226a957 100644
--- a/manifests/role/performance.pp
+++ b/manifests/role/performance.pp
@@ -6,7 +6,9 @@
 class role::performance {
 include ::apache
 
-deployment::target { 'reporter': }
+package { 'reporter/reporter':
+provider => 'trebuchet',
+}
 
 file { '/var/www/performance':
 ensure  => directory,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I955029c77538e970331f26c9f80143515bfa5e69
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hygiene: Abuse filter action button does not conform to the ... - change (mediawiki...MobileFrontend)

2014-10-14 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166702

Change subject: Hygiene: Abuse filter action button does not conform to the 
styleguide
..

Hygiene: Abuse filter action button does not conform to the styleguide

Bug: 72049
Change-Id: I84812aeb420a26f2eb915c56806d750a670fb7a9
---
M templates/modules/editor/AbuseFilterOverlay.hogan
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/02/166702/1

diff --git a/templates/modules/editor/AbuseFilterOverlay.hogan 
b/templates/modules/editor/AbuseFilterOverlay.hogan
index 59d3e3a..26d73c4 100644
--- a/templates/modules/editor/AbuseFilterOverlay.hogan
+++ b/templates/modules/editor/AbuseFilterOverlay.hogan
@@ -1,4 +1,4 @@
 
{{{message}}}
-   {{confirmMessage}}
+   {{confirmMessage}}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84812aeb420a26f2eb915c56806d750a670fb7a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] Put category popups in the inner overlay for now - change (mediawiki...VisualEditor)

2014-10-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166701

Change subject: Put category popups in the inner overlay for now
..

Put category popups in the inner overlay for now

We really shouldn't need the inner overlay for this,
we should be able to deal with popups being in
oo-ui-window-overlay. But for now, we're not, and
this fixes the current problems.

Depends on If16d16d2b in oojs-ui.

Bug: 72052
Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
3 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/01/166701/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index de4c4a1..fbc28b3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -77,7 +77,8 @@
'categories',
{
$: this.$,
-   $overlay: this.$overlay
+   $overlay: this.$overlay,
+   $popupOverlay: this.$innerOverlay
}
);
this.languagesPage = new ve.ui.MWLanguagesPage(
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 373ae7a..b93c686 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -14,7 +14,8 @@
  * @constructor
  * @param {string} name Unique symbolic name of page
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$overlay] Overlay to render category settings popups in
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( name, config ) {
// Configuration initialization
@@ -38,7 +39,7 @@
icon: 'settings'
} );
this.categoryWidget = new ve.ui.MWCategoryWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$overlay, $popupOverlay: 
config.$popupOverlay
} );
this.defaultSortInput = new OO.ui.TextInputWidget( {
$: this.$, placeholder: this.fallbackDefaultSortKey
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index b432f37..310dc27 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -15,6 +15,8 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
+ * @cfg {jQuery} [$popupOverlay] Overlay to render popups in
  */
 ve.ui.MWCategoryWidget = function VeUiMWCategoryWidget( config ) {
// Config intialization
@@ -32,7 +34,7 @@
this.popupState = false;
this.savedPopupState = false;
this.popup = new ve.ui.MWCategoryPopupWidget( {
-   $: this.$, $overlay: config.$overlay
+   $: this.$, $overlay: config.$popupOverlay
} );
this.input = new ve.ui.MWCategoryInputWidget( this, {
$: this.$, $overlay: config.$overlay

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie06056b96db19ac4caf1f9c0e3a1c49cfddc6682
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Introduce oo-ui-window-inner-overlay - change (oojs/ui)

2014-10-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166700

Change subject: Introduce oo-ui-window-inner-overlay
..

Introduce oo-ui-window-inner-overlay

This is another overlay placed where oo-ui-window-overlay
used to be before it was moved up.

This is a temporary measure and I look forward to killing it
with fire.

Change-Id: If16d16d2b2c926962b0e3be7a72d3f6022ace700
---
M src/Window.js
M src/styles/Dialog.less
M src/styles/Window.less
3 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/166700/1

diff --git a/src/Window.js b/src/Window.js
index 651726d..361337f 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -543,6 +543,7 @@
this.$head = this.$( '' );
this.$body = this.$( '' );
this.$foot = this.$( '' );
+   this.$innerOverlay = this.$( '' );
 
// Events
this.$element.on( 'mousedown', OO.ui.bind( this.onMouseDown, this ) );
@@ -551,7 +552,8 @@
this.$head.addClass( 'oo-ui-window-head' );
this.$body.addClass( 'oo-ui-window-body' );
this.$foot.addClass( 'oo-ui-window-foot' );
-   this.$content.append( this.$head, this.$body, this.$foot );
+   this.$innerOverlay.addClass( 'oo-ui-window-inner-overlay' );
+   this.$content.append( this.$head, this.$body, this.$foot, 
this.$innerOverlay );
 
return this;
 };
diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index f4bc29a..b2dd184 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -29,7 +29,7 @@
bottom: 0;
}
 
-   &-overlay {
+   &-inner-overlay {
z-index: 3;
}
}
diff --git a/src/styles/Window.less b/src/styles/Window.less
index c3b8728..586147f 100644
--- a/src/styles/Window.less
+++ b/src/styles/Window.less
@@ -30,7 +30,8 @@
background: none;
}
 
-   &-overlay {
+   &-overlay,
+   &-inner-overlay {
position: absolute;
top: 0;
left: 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If16d16d2b2c926962b0e3be7a72d3f6022ace700
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 7686be0..0436c01 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166699

Change subject: Syncronize VisualEditor: 7686be0..0436c01
..

Syncronize VisualEditor: 7686be0..0436c01

Change-Id: Ib05ac8a048903700c4b68a2811324d8baacbf7af
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/99/166699/1

diff --git a/VisualEditor b/VisualEditor
index 7686be0..0436c01 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 7686be00c4a6847cc193276742558a8e9977c0a1
+Subproject commit 0436c0148992cf168ab43db2085763169fca1355

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib05ac8a048903700c4b68a2811324d8baacbf7af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Correctly place CategoryPopupWidget in RTL - change (mediawiki...VisualEditor)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Correctly place CategoryPopupWidget in RTL
..


Correctly place CategoryPopupWidget in RTL

The previous check for RTL did not properly recognize
when the UI was in RTL, since the element in question has no explicit
'dir' attribute. The test now uses $element.css( 'direction' ) which
is inherited, and produces a correct result.

Change-Id: Ie30c2038428b10709dc30cb8320bdc94d76a5a18
---
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index 83566dc..bbd2755 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -183,7 +183,9 @@
height = this.$menu.outerHeight( true );
 
// Flip for RTL:
-   if ( this.$container.attr( 'dir' ) === 'rtl' ) {
+   // The $container does not have a 'dir' attribute; we must check the 
css( 'direction' )
+   // that is hierarchically inherited, instead, to get the proper rtl/ltr 
value
+   if ( this.$container.css( 'direction' ) === 'rtl' ) {
// flip me, I'm a mirror:
this.$element.css( {
right: this.$container.outerWidth( true ) - left,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie30c2038428b10709dc30cb8320bdc94d76a5a18
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 7686be0..0436c01 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 7686be0..0436c01
..


Syncronize VisualEditor: 7686be0..0436c01

Change-Id: Ib05ac8a048903700c4b68a2811324d8baacbf7af
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 7686be0..0436c01 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 7686be00c4a6847cc193276742558a8e9977c0a1
+Subproject commit 0436c0148992cf168ab43db2085763169fca1355

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib05ac8a048903700c4b68a2811324d8baacbf7af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Fix crasher in logging when error stack is suppressed - change (mediawiki...parsoid)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Fix crasher in logging when error stack is suppressed
..


Fix crasher in logging when error stack is suppressed

* Fixes crasher in http://localhost:8000/enwiki/Blahblahdoesnotexist

Change-Id: I34060aeaa70e1b3ccb2a7200bda5b039a1c99cde
---
M lib/LogData.js
1 file changed, 5 insertions(+), 8 deletions(-)

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



diff --git a/lib/LogData.js b/lib/LogData.js
index afe86e4..a9005b8 100644
--- a/lib/LogData.js
+++ b/lib/LogData.js
@@ -62,18 +62,15 @@
var origPrepareStackTrace = Error.prepareStackTrace;
 
// Override with function that just returns `stack`
-   Error.prepareStackTrace = function (_, stack) {
-   return stack;
-   };
+   Error.prepareStackTrace = function (_, stack) { return stack; };
 
-   // Create a new `Error`, which automatically gets `stack`
-   var stack = e.stack;
+   // Remove superfluous function calls on stack
+   //  (In some cases, stacks are suppressed
+   //   See DoesNotExistError in mediawikiApiRequest.js)
+   var stack = !e.stack ? "" : 'Stack:\n  ' + e.stack.slice(2).join('\n  
');
 
// Restore original `Error.prepareStackTrace`
Error.prepareStackTrace = origPrepareStackTrace;
-
-   // Remove superfluous function calls on stack
-   stack = 'Stack:\n  ' + stack.slice(2).join('\n  ');
 
return stack;
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34060aeaa70e1b3ccb2a7200bda5b039a1c99cde
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Marcoil 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Push previous and next buttons on mobile diff to stable - change (mediawiki...MobileFrontend)

2014-10-14 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166698

Change subject: Push previous and next buttons on mobile diff to stable
..

Push previous and next buttons on mobile diff to stable

Change-Id: Ia959f7a5bf9e7231250a85e289e3d35466819cfc
---
M includes/specials/SpecialMobileDiff.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/98/166698/1

diff --git a/includes/specials/SpecialMobileDiff.php 
b/includes/specials/SpecialMobileDiff.php
index b571b78..3829606 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -238,7 +238,7 @@
);
$prev = $this->rev->getPrevious();
$next = $this->rev->getNext();
-   if ( $ctx->isBetaGroupMember() && (  $prev || $next ) ) {
+   if ( $prev || $next ) {
$history = Html::openElement( 'ul', array( 'class' => 
'hlist revision-history-links' ) );
if ( $prev ) {
$history .= Html::openElement( 'li' ) .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia959f7a5bf9e7231250a85e289e3d35466819cfc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] Update Collection to wmf3 for cherry-pick - change (mediawiki/core)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Update Collection to wmf3 for cherry-pick
..


Update Collection to wmf3 for cherry-pick

Change-Id: I1eb30b85a6a372df83b07bfb10f7e2a7a275831f
---
M extensions/Collection
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/extensions/Collection b/extensions/Collection
index 6967798..01feb2e 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 69677987daa090ba6e6c2a157489cbb2d676325e
+Subproject commit 01feb2e6836b9d3dd2cbe95a3e9a984f6be4bd40

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1eb30b85a6a372df83b07bfb10f7e2a7a275831f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Collection to wmf3 for cherry-pick - change (mediawiki/core)

2014-10-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166697

Change subject: Update Collection to wmf3 for cherry-pick
..

Update Collection to wmf3 for cherry-pick

Change-Id: I1eb30b85a6a372df83b07bfb10f7e2a7a275831f
---
M extensions/Collection
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/166697/1

diff --git a/extensions/Collection b/extensions/Collection
index 6967798..01feb2e 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 69677987daa090ba6e6c2a157489cbb2d676325e
+Subproject commit 01feb2e6836b9d3dd2cbe95a3e9a984f6be4bd40

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb30b85a6a372df83b07bfb10f7e2a7a275831f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Remove jstorage.js fork
..


Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 4 insertions(+), 215 deletions(-)

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



diff --git a/Collection.php b/Collection.php
index 6e4e63c..181f7cc 100644
--- a/Collection.php
+++ b/Collection.php
@@ -211,9 +211,9 @@
 );
 
 $wgResourceModules += array(
+   // For backwards compatibility / race condition after removing 
js/jstorage.js
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -230,12 +230,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-   },
-
-   //

[MediaWiki-commits] [Gerrit] Switch to JSON.(parse|stringify) - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Switch to JSON.(parse|stringify)
..


Switch to JSON.(parse|stringify)

 * As suggested in,
   
https://www.mediawiki.org/w/index.php?title=ResourceLoader%2FDefault_modules&diff=1217242&oldid=1199051

 * Should have been part of change,
   Ib37dc3efc09b61264e462404b0befae43d93a734

Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
---
M js/jstorage.js
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/js/jstorage.js b/js/jstorage.js
index b41b04e..1d152ad 100644
--- a/js/jstorage.js
+++ b/js/jstorage.js
@@ -28,8 +28,7 @@
  * USAGE:
  *
  * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * jQuery-JSON (http://code.google.com/p/jquery-json/) is also needed.
- * (jQuery-JSON needs to be loaded BEFORE jStorage!)
+ * the json2.js polyfill may also be needed.
  *
  * Methods:
  *
@@ -69,10 +68,10 @@
_storage_elm: null,
 
/* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.encode),
+   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
 
/* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.decode) 
|| function(str){
+   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
return String(str).evalJSON();
},
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] jquery.json is deprecated - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: jquery.json is deprecated
..


jquery.json is deprecated

 * use "json" instead as suggested
   https://www.mediawiki.org/wiki/ResourceLoader/Default_modules#jquery.json

Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
---
M Collection.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/Collection.php b/Collection.php
index c89eabc..6e4e63c 100644
--- a/Collection.php
+++ b/Collection.php
@@ -213,7 +213,7 @@
 $wgResourceModules += array(
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
'scripts' => 'jstorage.js',
-   'dependencies' => 'jquery.json'
+   'dependencies' => 'json'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update Collection to wmf2 for cherry-picks - change (mediawiki/core)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Update Collection to wmf2 for cherry-picks
..


Update Collection to wmf2 for cherry-picks

Change-Id: I357820ba21a979770f4dd0677849086b29ead65a
---
M extensions/Collection
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/extensions/Collection b/extensions/Collection
index 9101413..352fbf7 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 910141321ecbb5ad1e45c49949f24d219957b2be
+Subproject commit 352fbf7c459df1d6036a6b38ef45c73c27f238be

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I357820ba21a979770f4dd0677849086b29ead65a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] jquery.json is deprecated - change (mediawiki...Collection)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166694

Change subject: jquery.json is deprecated
..

jquery.json is deprecated

 * use "json" instead as suggested
   https://www.mediawiki.org/wiki/ResourceLoader/Default_modules#jquery.json

Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
---
M Collection.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/94/166694/1

diff --git a/Collection.php b/Collection.php
index c89eabc..6e4e63c 100644
--- a/Collection.php
+++ b/Collection.php
@@ -213,7 +213,7 @@
 $wgResourceModules += array(
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
'scripts' => 'jstorage.js',
-   'dependencies' => 'jquery.json'
+   'dependencies' => 'json'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] Switch to JSON.(parse|stringify) - change (mediawiki...Collection)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166695

Change subject: Switch to JSON.(parse|stringify)
..

Switch to JSON.(parse|stringify)

 * As suggested in,
   
https://www.mediawiki.org/w/index.php?title=ResourceLoader%2FDefault_modules&diff=1217242&oldid=1199051

 * Should have been part of change,
   Ib37dc3efc09b61264e462404b0befae43d93a734

Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
---
M js/jstorage.js
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/95/166695/1

diff --git a/js/jstorage.js b/js/jstorage.js
index b41b04e..1d152ad 100644
--- a/js/jstorage.js
+++ b/js/jstorage.js
@@ -28,8 +28,7 @@
  * USAGE:
  *
  * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * jQuery-JSON (http://code.google.com/p/jquery-json/) is also needed.
- * (jQuery-JSON needs to be loaded BEFORE jStorage!)
+ * the json2.js polyfill may also be needed.
  *
  * Methods:
  *
@@ -69,10 +68,10 @@
_storage_elm: null,
 
/* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.encode),
+   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
 
/* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.decode) 
|| function(str){
+   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
return String(str).evalJSON();
},
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf3
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] Modernize database update hook - change (mediawiki...AntiSpoof)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Modernize database update hook
..


Modernize database update hook

Change-Id: Ic3c3550f73a32fadc7fe3942bec1d056c8b552a2
---
M AntiSpoofHooks.php
1 file changed, 3 insertions(+), 10 deletions(-)

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



diff --git a/AntiSpoofHooks.php b/AntiSpoofHooks.php
index e8a7292..290b437 100644
--- a/AntiSpoofHooks.php
+++ b/AntiSpoofHooks.php
@@ -5,16 +5,9 @@
 * @param $updater DatabaseUpdater
 * @return bool
 */
-   public static function asUpdateSchema( $updater = null ) {
-   if ( $updater === null ) {
-   global $wgExtNewTables, $wgDBtype;
-   $wgExtNewTables[] = array(
-   'spoofuser',
-   __DIR__ . '/sql/patch-antispoof.' . $wgDBtype . 
'.sql', true );
-   } else {
-   $updater->addExtensionUpdate( array( 'addTable', 
'spoofuser',
-   __DIR__ . '/sql/patch-antispoof.' . 
$updater->getDB()->getType() . '.sql', true ) );
-   }
+   public static function asUpdateSchema( DatabaseUpdater $updater ) {
+   $updater->addExtensionTable( 'spoofuser',
+   __DIR__ . '/sql/patch-antispoof.' . 
$updater->getDB()->getType() . '.sql' );
return true;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3c3550f73a32fadc7fe3942bec1d056c8b552a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166696

Change subject: Remove jstorage.js fork
..

Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 4 insertions(+), 215 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/96/166696/1

diff --git a/Collection.php b/Collection.php
index 6e4e63c..181f7cc 100644
--- a/Collection.php
+++ b/Collection.php
@@ -211,9 +211,9 @@
 );
 
 $wgResourceModules += array(
+   // For backwards compatibility / race condition after removing 
js/jstorage.js
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -230,12 +230,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-

[MediaWiki-commits] [Gerrit] Update Collection to wmf2 for cherry-picks - change (mediawiki/core)

2014-10-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166693

Change subject: Update Collection to wmf2 for cherry-picks
..

Update Collection to wmf2 for cherry-picks

Change-Id: I357820ba21a979770f4dd0677849086b29ead65a
---
M extensions/Collection
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/166693/1

diff --git a/extensions/Collection b/extensions/Collection
index 9101413..352fbf7 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 910141321ecbb5ad1e45c49949f24d219957b2be
+Subproject commit 352fbf7c459df1d6036a6b38ef45c73c27f238be

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I357820ba21a979770f4dd0677849086b29ead65a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Modernize database update hook - change (mediawiki...AntiSpoof)

2014-10-14 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166692

Change subject: Modernize database update hook
..

Modernize database update hook

Change-Id: Ic3c3550f73a32fadc7fe3942bec1d056c8b552a2
---
M AntiSpoofHooks.php
1 file changed, 3 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof 
refs/changes/92/166692/1

diff --git a/AntiSpoofHooks.php b/AntiSpoofHooks.php
index e8a7292..290b437 100644
--- a/AntiSpoofHooks.php
+++ b/AntiSpoofHooks.php
@@ -5,16 +5,9 @@
 * @param $updater DatabaseUpdater
 * @return bool
 */
-   public static function asUpdateSchema( $updater = null ) {
-   if ( $updater === null ) {
-   global $wgExtNewTables, $wgDBtype;
-   $wgExtNewTables[] = array(
-   'spoofuser',
-   __DIR__ . '/sql/patch-antispoof.' . $wgDBtype . 
'.sql', true );
-   } else {
-   $updater->addExtensionUpdate( array( 'addTable', 
'spoofuser',
-   __DIR__ . '/sql/patch-antispoof.' . 
$updater->getDB()->getType() . '.sql', true ) );
-   }
+   public static function asUpdateSchema( DatabaseUpdater $updater ) {
+   $updater->addExtensionTable( 'spoofuser',
+   __DIR__ . '/sql/patch-antispoof.' . 
$updater->getDB()->getType() . '.sql' );
return true;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3c3550f73a32fadc7fe3942bec1d056c8b552a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Hygiene: Page list thumbnails are not icons - change (mediawiki...MobileFrontend)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Page list thumbnails are not icons
..


Hygiene: Page list thumbnails are not icons

Refactor these so they are something different.

Also:
Remove styling relating to page previews
Change-Id: Ieb4e6155374712ec0b0293d99f8e2a9f4723409d
---
M includes/MobilePage.php
M includes/specials/MobileSpecialPageFeed.php
M includes/specials/SpecialMobileEditWatchlist.php
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/search/pageImages.js
M less/Overlay.less
M less/icons.less
M less/modules/search/SearchOverlay.less
M less/pagelist.less
M less/specials/userprofile.less
M templates/modules/articleList.hogan
M tests/qunit/modules/nearby/test_NearbyApi.js
12 files changed, 39 insertions(+), 68 deletions(-)

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



diff --git a/includes/MobilePage.php b/includes/MobilePage.php
index 1ace9b8..bc68141 100644
--- a/includes/MobilePage.php
+++ b/includes/MobilePage.php
@@ -52,7 +52,7 @@
 */
public static function getPlaceHolderThumbnailHtml( $className, 
$iconClassName = 'icon-32px' ) {
return Html::element( 'div', array(
-   'class' => 'listThumb list-thumb-placeholder icon ' . 
$iconClassName . ' ' . $className,
+   'class' => 'list-thumb list-thumb-placeholder ' . 
$iconClassName . ' ' . $className,
) );
}
 
@@ -109,10 +109,10 @@
if ( $file ) {
$thumb = $file->transform( array( 'width' => 
$size ) );
if ( $thumb && $thumb->getUrl() ) {
-   $className = 'listThumb ';
+   $className = 'list-thumb ';
$className .= $thumb->getWidth() > 
$thumb->getHeight()
-   ? 'icon icon-max-y'
-   : 'icon icon-max-x';
+   ? 'list-thumb-y'
+   : 'list-thumb-x';
$props = array(
'class' => $className,
);
diff --git a/includes/specials/MobileSpecialPageFeed.php 
b/includes/specials/MobileSpecialPageFeed.php
index b8b071e..aff67f5 100644
--- a/includes/specials/MobileSpecialPageFeed.php
+++ b/includes/specials/MobileSpecialPageFeed.php
@@ -115,7 +115,7 @@
$html .= ChangesList::flag( 'minor' );
}
 
-   $html .= Html::openElement( 'div', array( 'class' => 
'listThumb' ) ) .
+   $html .= Html::openElement( 'div', array( 'class' => 
'list-thumb' ) ) .
Html::element( 'p', array( 'class' => 'timestamp' ), 
$lang->userTime( $ts, $user ) );
 
if ( $bytes ) {
diff --git a/includes/specials/SpecialMobileEditWatchlist.php 
b/includes/specials/SpecialMobileEditWatchlist.php
index 6fd2593..4b5c93d 100644
--- a/includes/specials/SpecialMobileEditWatchlist.php
+++ b/includes/specials/SpecialMobileEditWatchlist.php
@@ -83,7 +83,7 @@
$thumb = 
$mobilePage->getSmallThumbnailHtml();
}
if ( !$thumb ) {
-   $thumb = 
MobilePage::getPlaceHolderThumbnailHtml( 'needsPhoto', 'icon-max-x' );
+   $thumb = 
MobilePage::getPlaceHolderThumbnailHtml( 'list-thumb-none', 'list-thumb-x' );
}
$total += 1;
$html .= self::getLineHtml( $title, 
$title->getTouched(), $thumb );
diff --git a/javascripts/modules/nearby/NearbyApi.js 
b/javascripts/modules/nearby/NearbyApi.js
index dc5e9a2..d67a070 100644
--- a/javascripts/modules/nearby/NearbyApi.js
+++ b/javascripts/modules/nearby/NearbyApi.js
@@ -108,10 +108,9 @@
if ( page.thumbnail ) {
thumb = page.thumbnail;
page.listThumbStyleAttribute = 
'background-image: url(' + thumb.source + ')';
-   page.pageimageClass = 
thumb.width > thumb.height ? 'icon icon-max-y' : 'icon icon-max-x';
+   page.pageimageClass = 
thumb.width > thumb.height ? 'list-thumb-y' : 'list-thumb-x';
} else {
-   // FIXME: Rename needsPhoto to 
needs-photo
-   page.pageimag

[MediaWiki-commits] [Gerrit] Send error when caught - change (mediawiki...parsoid)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Send error when caught
..


Send error when caught

Change-Id: I108ec42284cbf916f8e0aed0d469b57895cb50de
---
M api/routes.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/api/routes.js b/api/routes.js
index 90c0762..2ba1bd9 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -336,7 +336,7 @@
res.on( 'finish', resolve );
}).catch(function(e) {
console.error( e.stack || e );
-   res.end();
+   res.end( e.stack || e );
}).nodify(callback);
}
return Promise.resolve().nodify(callback);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I108ec42284cbf916f8e0aed0d469b57895cb50de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Remove jstorage.js fork
..


Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 4 insertions(+), 215 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/Collection.php b/Collection.php
index c353fcd..ec78fd6 100644
--- a/Collection.php
+++ b/Collection.php
@@ -206,9 +206,9 @@
 );
 
 $wgResourceModules += array(
+   // For backwards compatibility / race condition after removing 
js/jstorage.js
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -225,12 +225,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-   },
-
-   //

[MediaWiki-commits] [Gerrit] jquery.json is deprecated - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: jquery.json is deprecated
..


jquery.json is deprecated

 * use "json" instead as suggested
   https://www.mediawiki.org/wiki/ResourceLoader/Default_modules#jquery.json

Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
---
M Collection.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/Collection.php b/Collection.php
index 7297160..c353fcd 100644
--- a/Collection.php
+++ b/Collection.php
@@ -208,7 +208,7 @@
 $wgResourceModules += array(
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
'scripts' => 'jstorage.js',
-   'dependencies' => 'jquery.json'
+   'dependencies' => 'json'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib37dc3efc09b61264e462404b0befae43d93a734
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switch to JSON.(parse|stringify) - change (mediawiki...Collection)

2014-10-14 Thread Catrope (Code Review)

Catrope has submitted this change and it was merged.

Change subject: Switch to JSON.(parse|stringify)
..


Switch to JSON.(parse|stringify)

 * As suggested in,
   
https://www.mediawiki.org/w/index.php?title=ResourceLoader%2FDefault_modules&diff=1217242&oldid=1199051

 * Should have been part of change,
   Ib37dc3efc09b61264e462404b0befae43d93a734

Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
---
M js/jstorage.js
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/js/jstorage.js b/js/jstorage.js
index b41b04e..1d152ad 100644
--- a/js/jstorage.js
+++ b/js/jstorage.js
@@ -28,8 +28,7 @@
  * USAGE:
  *
  * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * jQuery-JSON (http://code.google.com/p/jquery-json/) is also needed.
- * (jQuery-JSON needs to be loaded BEFORE jStorage!)
+ * the json2.js polyfill may also be needed.
  *
  * Methods:
  *
@@ -69,10 +68,10 @@
_storage_elm: null,
 
/* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.encode),
+   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
 
/* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.decode) 
|| function(str){
+   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
return String(str).evalJSON();
},
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I354375a9a32a5ce379aca19b2d7c4c4114748c72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.25wmf2
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove all the ajax related things. - change (mediawiki...MobileFrontend)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Remove all the ajax related things.
..


Remove all the ajax related things.

Need to sync with Zero team. Might be worth moving this to
Zero extension if they still need it. According to Adam
they do not need it at current time.

Bug: 45299
Change-Id: I269499168a299aef24d1446d2d9224d46d6b34b8
---
M MobileFrontend.alias.php
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
M includes/Resources.php
D includes/skins/SkinMinervaApp.php
D includes/specials/SpecialMobileWebApp.php
M javascripts/Page.js
M javascripts/Section.js
D javascripts/app/startup.js
M javascripts/application.js
D javascripts/externals/epoch.js
D javascripts/history-alpha.js
M javascripts/modules/editor/editor.js
M javascripts/modules/issues/issues.js
M javascripts/modules/languages/languages.js
M javascripts/modules/lastEdited/lastEdited.js
D javascripts/modules/lazyload.js
M javascripts/modules/mediaViewer/init.js
M javascripts/modules/references/references.js
M javascripts/modules/talk/talk.js
M javascripts/modules/toc/toc.js
M javascripts/modules/toggling/toggle.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/modules/uploads/init.js
M javascripts/modules/watchstar/init.js
D templates/page.hogan
D templates/section.hogan
D tests/browser/features/page_loading.feature
D tests/qunit/test_history-alpha.js
29 files changed, 21 insertions(+), 744 deletions(-)

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



diff --git a/MobileFrontend.alias.php b/MobileFrontend.alias.php
index 13e6875..f39bf3d 100644
--- a/MobileFrontend.alias.php
+++ b/MobileFrontend.alias.php
@@ -12,7 +12,6 @@
 /** English (English) */
 $specialPageAliases['en'] = array(
'History' => array( 'History' ),
-   'MobileWebApp' => array( 'MobileWebApp' ),
'MobileOptions' => array( 'MobileOptions' ),
'Uploads' => array( 'Uploads' ),
'MobileDiff' => array( 'MobileDiff' ),
diff --git a/MobileFrontend.php b/MobileFrontend.php
index e9b1bb0..6da6c7d 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -64,7 +64,6 @@
 
'MobileSiteModule' => 'modules/MobileSiteModule',
 
-   'SpecialMobileWebApp' => 'specials/SpecialMobileWebApp',
'SpecialUploads' => 'specials/SpecialUploads',
'SpecialUserProfile' => 'specials/SpecialUserProfile',
'SpecialMobileHistory' => 'specials/SpecialMobileHistory',
@@ -89,7 +88,6 @@
'SkinMinerva' => 'skins/SkinMinerva',
'SkinMinervaBeta' => 'skins/SkinMinervaBeta',
'SkinMinervaAlpha' => 'skins/SkinMinervaAlpha',
-   'SkinMinervaApp' => 'skins/SkinMinervaApp',
 
'UserLoginAndCreateTemplate' => 'skins/UserLoginAndCreateTemplate',
'UserLoginMobileTemplate' => 'skins/UserLoginMobileTemplate',
@@ -151,7 +149,6 @@
'MobileOptions' => 'SpecialMobileOptions',
'MobileMenu' => 'SpecialMobileMenu',
'MobileLanguages' => 'SpecialMobileLanguages',
-   'MobileWebApp' => 'SpecialMobileWebApp',
'Uploads' => 'SpecialUploads',
'UserProfile' => 'SpecialUserProfile',
 ) );
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 6853ba2..33c325c 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -88,14 +88,11 @@
$skinName = $wgMFDefaultSkinClass;
$betaSkinName = $skinName . 'Beta';
$alphaSkinName = $skinName . 'Alpha';
-   $appSkinName = $skinName . 'App';
// Force alpha for test mode to sure all modules can run
$name = $context->getTitle()->getDBkey();
$inTestMode =
$name === SpecialPage::getTitleFor( 'JavaScriptTest', 
'qunit' )->getDBkey();
-   if ( $name === 'MobileWebApp' || $name === 
'MobileWebApp/manifest' ) {
-   $skinName = $appSkinName;
-   } elseif ( ( $mobileContext->isAlphaGroupMember() || 
$inTestMode ) &&
+   if ( ( $mobileContext->isAlphaGroupMember() || $inTestMode ) &&
class_exists( $alphaSkinName ) ) {
$skinName = $alphaSkinName;
} elseif ( $mobileContext->isBetaGroupMember() && class_exists( 
$betaSkinName ) ) {
diff --git a/includes/Resources.php b/includes/Resources.php
index 8fca9ac..27a33c1 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -162,10 +162,6 @@
'mobile.redlinks',
'ext.mantle.views',
),
-   'templates' => array(
-   'page.hogan',
-   'section.hogan',
-   ),
'messages' => array(
'mobile-frontend-language-article-heading',
),
@@ -496,20 +492,6 @@
'mobile

[MediaWiki-commits] [Gerrit] Never hit the API when running QUnit tests - change (mediawiki...MobileFrontend)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Never hit the API when running QUnit tests
..


Never hit the API when running QUnit tests

Bug: 64635
Change-Id: Ib8a927ec92e041c92f2a1075a8246a8e743ad6cf
---
M javascripts/modules/talk/TalkSectionAddOverlay.js
M javascripts/specials/uploads.js
M tests/qunit/modules/editor/test_EditorOverlay.js
M tests/qunit/modules/nearby/test_Nearby.js
M tests/qunit/modules/talk/test_TalkSectionAddOverlay.js
5 files changed, 21 insertions(+), 17 deletions(-)

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



diff --git a/javascripts/modules/talk/TalkSectionAddOverlay.js 
b/javascripts/modules/talk/TalkSectionAddOverlay.js
index 6e06536..b420d2a 100644
--- a/javascripts/modules/talk/TalkSectionAddOverlay.js
+++ b/javascripts/modules/talk/TalkSectionAddOverlay.js
@@ -105,20 +105,15 @@
this.confirm.prop( 'disabled', true );
this.$( '.content' ).empty().addClass( 
'loading' );
this.$( '.buttonBar' ).hide();
-   api.getTokenWithEndpoint().done( function( 
token ) {
-   api.post( {
-   action: 'edit',
-   section: 'new',
-   sectiontitle: heading,
-   title: self.title,
-   token: token,
-   summary: mw.msg( 
'mobile-frontend-talk-edit-summary', heading ),
-   text: text + ' '
-   } ).done( function() {
-   result.resolve( 'ok' );
-   } ).fail( function( msg ) {
-   result.reject( { type: 'error', 
details: msg } );
-   } );
+   api.postWithToken( 'edit', {
+   action: 'edit',
+   section: 'new',
+   sectiontitle: heading,
+   title: self.title,
+   summary: mw.msg( 
'mobile-frontend-talk-edit-summary', heading ),
+   text: text + ' '
+   } ).done( function() {
+   result.resolve( 'ok' );
} ).fail( function( msg ) {
result.reject( { type: 'error', 
details: msg } );
} );
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index 1901b0c..fd1b891 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -221,7 +221,7 @@
}
}
 
-   if ( userName && !M.testMode ) {
+   if ( userName && mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'Uploads' ) {
$( init );
}
 
diff --git a/tests/qunit/modules/editor/test_EditorOverlay.js 
b/tests/qunit/modules/editor/test_EditorOverlay.js
index 2923358..1772a65 100644
--- a/tests/qunit/modules/editor/test_EditorOverlay.js
+++ b/tests/qunit/modules/editor/test_EditorOverlay.js
@@ -8,6 +8,8 @@
setup: function() {
apiSpy = this.sandbox.spy( EditorApi.prototype, 
'initialize' );
 
+   // prevent event logging requests
+   this.sandbox.stub( EditorOverlay.prototype, 'log' 
).returns( $.Deferred().resolve() );
this.sandbox.stub( EditorApi.prototype, 'getContent' ).
returns( $.Deferred().resolve( 'section 0' ) );
}
diff --git a/tests/qunit/modules/nearby/test_Nearby.js 
b/tests/qunit/modules/nearby/test_Nearby.js
index c873df3..5a7b18f 100644
--- a/tests/qunit/modules/nearby/test_Nearby.js
+++ b/tests/qunit/modules/nearby/test_Nearby.js
@@ -1,6 +1,7 @@
 ( function ( M, $ ) {
 
var NearbyApi = M.require( 'modules/nearby/NearbyApi' ),
+   WatchstarApi = M.require( 'modules/watchstar/WatchstarApi' ),
Nearby = M.require( 'modules/nearby/Nearby' );
 
QUnit.module( 'MobileFrontend modules/nearby/Nearby (1 - no results)', {
@@ -22,6 +23,10 @@
 
QUnit.module( 'MobileFrontend modules/nearby/Nearby (2 - has results)', 
{
setup: function() {
+   var resp = { query: { pages: { 2: { watched: "" }, 3: 
{}, 4: {} } } };
+   // prevent hits to api due to watch status lookup
+   this.sandbox.stub( Watchs

[MediaWiki-commits] [Gerrit] Configure Elasticsearch for statsd - change (operations/puppet)

2014-10-14 Thread Chad (Code Review)

Chad has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166690

Change subject: Configure Elasticsearch for statsd
..

Configure Elasticsearch for statsd

Follows up I36ff0f43: need to send the data to statsd,
not graphite directly.

Change-Id: I8e7dd5cff936e28f96cb3497205c6b9566566bc6
---
M manifests/role/elasticsearch.pp
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch.yml.erb
3 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/166690/1

diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index b228ca6..6dcbcb4 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -34,7 +34,7 @@
 $unicast_hosts= ['deployment-elastic01',
 'deployment-elastic02', 'deployment-elastic03',
 'deployment-elastic04']
-$graphite_host= 'labmon1001.eqiad.wmnet'
+$statsd_host= 'labmon1001.eqiad.wmnet'
 } else {
 # Regular labs instance
 # We don't know how many instances will be in each labs project so
@@ -57,8 +57,8 @@
 $expected_nodes   = 1
 $recover_after_nodes  = 1
 
-# Don't let random test instances spam graphite
-$graphite_host = undef
+# Don't let random test instances spam statsd
+$statsd_host = undef
 }
 } else {
 # Production
@@ -93,7 +93,7 @@
 $unicast_hosts= undef
 
 # Not enabled in production yet
-$graphite_host = undef
+$statsd_host = undef
 
 # Production elasticsearch needs these plugins to be loaded in order
 # to work properly.  This will keep elasticsearch from starting
@@ -146,7 +146,7 @@
 require=> 
Deployment::Target['elasticsearchplugins'],
 bulk_thread_pool_capacity  => $bulk_thread_pool_capacity,
 bulk_thread_pool_executors => $bulk_thread_pool_executors,
-graphite_host  => $graphite_host,
+statsd_host  => $statsd_host,
 }
 
 include ::elasticsearch::ganglia
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index a4d0903..0e05ea9 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -55,7 +55,7 @@
 # - $bulk_thread_pool_capacity: queue depth for bulk actions of each node.
 # - $bulk_thread_pool_executors: number of executors for bulk actions on each
 #   node.
-# - $graphite_host: host to send graphite data to
+# - $statsd_host: host to send statsd data to
 #
 # == Sample usage:
 #
@@ -82,7 +82,7 @@
 $filter_cache_size = '10%',
 $bulk_thread_pool_executors = undef,
 $bulk_thread_pool_capacity = undef,
-$graphite_host = undef) {
+$statsd_host = undef) {
 
 include ::elasticsearch::packages
 
diff --git a/modules/elasticsearch/templates/elasticsearch.yml.erb 
b/modules/elasticsearch/templates/elasticsearch.yml.erb
index a8aa360..dc0fbef 100644
--- a/modules/elasticsearch/templates/elasticsearch.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch.yml.erb
@@ -554,12 +554,12 @@
  - org.apache.lucene.util.automaton.CharacterRunAutomaton
 
 ##
-# Graphite plugin configuration
+# Statsd plugin configuration
 ##
-<% if @graphite_host -%>
-metrics.graphite.host: <%= @graphite_host %>
+<% if @statsd_host -%>
+metrics.statsd.host: <%= @statsd_host %>
 <% else -%>
-#metrics.graphite.host: monitoring1001
+#metrics.statsd.host: monitoring1001
 <% end -%>
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e7dd5cff936e28f96cb3497205c6b9566566bc6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Send error when caught - change (mediawiki...parsoid)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166691

Change subject: Send error when caught
..

Send error when caught

Change-Id: I108ec42284cbf916f8e0aed0d469b57895cb50de
---
M api/routes.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/91/166691/1

diff --git a/api/routes.js b/api/routes.js
index 90c0762..2ba1bd9 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -336,7 +336,7 @@
res.on( 'finish', resolve );
}).catch(function(e) {
console.error( e.stack || e );
-   res.end();
+   res.end( e.stack || e );
}).nodify(callback);
}
return Promise.resolve().nodify(callback);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I108ec42284cbf916f8e0aed0d469b57895cb50de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] jquery.badge: Swap non-breaking space character for regular ... - change (mediawiki/core)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: jquery.badge: Swap non-breaking space character for regular 
space
..


jquery.badge: Swap non-breaking space character for regular space

Follows-up d453f81f4e. PHP's native json_encode requires input
being a UTF-8 string. For some reason MediaWiki, Git or OS X is
not reading jquery.badge.css as UTF-8 for me.

https://bugs.php.net/bug.php?id=51947

Due to json_encode rejecting the entire value and returning null
instead, the jquery.badge stylesheet was absent. load.php:

 mw.loader.implement("jquery.badge",function, {"css":[null]} );

Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
---
M resources/src/jquery/jquery.badge.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/jquery/jquery.badge.css 
b/resources/src/jquery/jquery.badge.css
index fa7ea70..34cdf76 100644
--- a/resources/src/jquery/jquery.badge.css
+++ b/resources/src/jquery/jquery.badge.css
@@ -13,7 +13,7 @@
font-weight: bold;
color: white;
vertical-align: baseline;
-   text-shadow: 0 1px rgba(0, 0, 0, 0.4);
+   text-shadow: 0 1px rgba(0, 0, 0, 0.4);
 }
 
 .mw-badge-inline {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Lots of rights changes for huwiki - change (operations/mediawiki-config)

2014-10-14 Thread Calak (Code Review)

Calak has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166687

Change subject: Lots of rights changes for huwiki
..

Lots of rights changes for huwiki

Bug: 72055
Change-Id: I437204fbdbc8100d21a2fff373a57828f45d0ed8
---
M wmf-config/InitialiseSettings.php
M wmf-config/flaggedrevs.php
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/87/166687/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6853a4c..bc5d4d7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4008,6 +4008,7 @@
'ckbwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), // bug 52533
'enwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // bug 55432
'hewiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), //bug 58207
+   'huwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // bug 72055
'plwiki' => array( '', 'autoconfirmed', 'editor', 'sysop', 
'superprotect' ), // bug 46990
'ptwiki' => array( '', 'autoconfirmed', 'autoreviewer', 'sysop', 
'superprotect' ), // bug 39652
'rowiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // bug 61172
@@ -7175,8 +7176,9 @@
),
'huwiki' => array(
'editor' => array( 'noratelimit' => true ),
-   'sysop' => array( 'deleterevision' => true ),
+   'sysop' => array( 'templateeditor' => true ), // bug 72055
'user' => array( 'upload' => true ), // bug 28576
+   'templateeditor' => array( 'templateeditor' => true ), // bug 
72055
),
'idwiki' => array(
'*' => array( 'createpage' => false ),
@@ -8128,6 +8130,9 @@
'bureaucrat' => array( 'patroller', 'autopatrolled' ),
'sysop' => array( 'patroller', 'autopatrolled' ),
),
+   '+huwiki' => array(
+   'bureaucrat' => array( 'sysop', 'bureaucrat', 'templateeditor' 
), // bug 72055
+   ),
'+idwiki' => array(
'sysop' => array( 'rollbacker' ),
'bureaucrat' => array( 'rollbacker' ),
@@ -8665,7 +8670,7 @@
'sysop' => array( 'patroller', 'autopatrolled' ),
),
'+huwiki' => array(
-   'bureaucrat' => array( 'confirmed' ),
+   'bureaucrat' => array( 'templateeditor' ), // bug 72055
),
'+idwiki' => array(
'sysop' => array( 'rollbacker' ),
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index 3304581..7dbb716 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -489,6 +489,11 @@
unset( $wgAddGroups['sysop'][ array_search( 'editor', 
$wgAddGroups['sysop'] ) ] );
if ( is_array( $wgRemoveGroups['sysop'] ) )
unset( $wgRemoveGroups['sysop'][ array_search( 'editor', 
$wgRemoveGroups['sysop'] ) ] );
+
+   // # Remove 'autoreview' user groups; bug 72055
+   unset( $wgGroupPermissions['autoreview'] );
+   $wgAddGroups['sysop'] = array_diff( $wgAddGroups['sysop'], array( 
'autoreview' ) );
+   $wgRemoveGroups['sysop'] = array_diff( $wgRemoveGroups['sysop'], array( 
'autoreview' ) );
 }
 
 elseif ( $wgDBname == 'iawiki' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I437204fbdbc8100d21a2fff373a57828f45d0ed8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Calak 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mailman: add more template translations - change (operations/puppet)

2014-10-14 Thread John F. Lewis (Code Review)

John F. Lewis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166686

Change subject: mailman: add more template translations
..

mailman: add more template translations

Add ar, hr, it no, pt, sk and vi template
translations to puppet.

Change-Id: If4cb1feca9b527e6c381cfd6d1a79a3db80c0e8c
---
A files/mailman/templates/ar/listinfo.html
A files/mailman/templates/hr/listinfo.html
A files/mailman/templates/it/listinfo.html
A files/mailman/templates/no/listinfo.html
A files/mailman/templates/pt/listinfo.html
A files/mailman/templates/sk/listinfo.html
A files/mailman/templates/vi/listinfo.html
7 files changed, 1,898 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/166686/1

diff --git a/files/mailman/templates/ar/listinfo.html 
b/files/mailman/templates/ar/listinfo.html
new file mode 100644
index 000..5a08af4
--- /dev/null
+++ b/files/mailman/templates/ar/listinfo.html
@@ -0,0 +1,272 @@
+
+
+
+
+  
+ القائمة البريدية - ويكيميديا
+
+  html, body {
+height: 100%;
+  }
+  body {
+margin: 0px;
+padding: 0px;
+background: #F0F0F0;
+font-family: 'Open Sans', sans-serif;
+font-size: 13px;
+color: #252525;
+  }   
+  h1, h2, h3 {
+margin: 0;
+padding: 0;
+  }
+  p, ol, ul {
+margin-top: 0px;
+  }
+  p {
+line-height: 180%;
+  }
+  a {
+color: #FF;
+  }
+  a:hover {
+text-decoration: none;
+  }
+  a img {
+border: none;
+  }
+  img.border {
+  }
+  img.alignleft {
+float: left;
+  }
+  img.alignright {
+float: right;
+  }
+  img.aligncenter {
+margin: 0px auto;
+margin-top: -25px;
+padding-bottom: 10px;
+  }
+  hr {
+display: none;
+  }
+
+/** WRAPPER */
+
+  .container {
+width: 1000px;
+margin: 0px auto;
+  }
+
+/** MENU */
+
+  #menu {
+#float: right;
+#width: 600px;
+#height: 99px;
+  }
+  #menu ul {
+#float: right;
+margin-left: -25px;
+#padding: 40x 0px;
+list-style: none;
+line-height: normal;
+  }
+  #menu li {
+#float: left;
+#margin-left: 2em;
+  }
+  #menu a {
+display: block;
+padding: 10px 0px;
+letter-spacing: 2px;
+text-decoration: none;
+text-transform: uppercase;
+font-family: 'Archivo Narrow', sans-serif;
+font-size: 1.10em;
+font-weight: 600;
+color: #252525;
+  }
+  #menu .active a {
+background: #0091E6;
+border-radius: 5px;
+color: #FF;
+  }
+  #menu a:hover {
+text-decoration: underline;
+  }
+
+/** PAGE */
+
+  #page {
+overflow: hidden;
+width: 900px;
+padding: 50px 30px 30px 30px;
+background-color: #FF;
+border-radius: 10px 10px 10px 10px;
+  }
+  #page h2 {
+margin-bottom: 30px;
+  }
+
+/** CONTENT */
+
+  #content {
+float: right;
+width: 660px;
+  }
+  #content #onecolumn {
+padding-bottom: 15px;
+border-bottom: 1px solid #D4D4D4;
+  }
+  #content h2 {
+letter-spacing: -1px;
+font-size: 3em;
+  }
+
+/** SIDEBAR */
+
+  #sidebar {
+float: left;
+width: 220px;
+padding-top: 0px;
+  }
+  #sidebar #sbox1 {
+margin-bottom: 40px;
+  }
+  #sidebar #sbox2 {
+overflow: hidden;
+margin-bottom: 50px;
+  }
+  #sidebar #sbox3 {
+overflow: hidden;
+  }
+
+/** FOOTER */
+  
+  #copyright{
+overflow: hidden;
+width: 900px;
+padding: 50px;
+  }
+  #copyright p {
+text-align: center;
+#text-shadow: 1px 1px 1px rgba(0,0,0,1);
+  }
+  #copyright a {
+  color: #4E4E4E;
+  }
+
+/** BODY */
+
+  #two-column {
+padding-top: 30px;
+  }
+  .box-content {
+overflow: hidden;
+margin-bottom: 2em;
+  }
+  .box-content p {
+padding-left: 60px;
+  }
+  .title {
+display: block;
+padding-left: 60px;
+padding-bottom: 1em;
+font-size: 1.70em !important;
+font-weight: 600;
+color: #252525;
+  }
+  .title01 {
+background: 
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/5a/News_subscribe.png/40px-News_subscribe.png)
 no-repeat left top;
+  }
+  .title02 {
+background: 
url(//upload.wikimedia.org/wikipedia/commons/thumb/9/94/Filing_cabinet_icon.svg/40px-Filing_cabinet_icon.svg.png)
 no-repeat left top;
+  }
+  .title03 {
+background: 
url(//upload.wikimedia.org/wikipedia/commons/thumb/e/e6/E

[MediaWiki-commits] [Gerrit] Fix and enhance RecentChangesFilterOptionsTest - change (mediawiki...Wikibase)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Fix and enhance RecentChangesFilterOptionsTest
..


Fix and enhance RecentChangesFilterOptionsTest

By explicitly setting the user usenewrc user option.
This is needed after I0736f82ed8f7 changed the default for that
user option.

Change-Id: Ieeed2fe676a5eb1c1650d37eb706c3d218d00157
---
M client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
1 file changed, 44 insertions(+), 8 deletions(-)

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



diff --git 
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
 
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
index 198efdf..f4cc221 100644
--- 
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
+++ 
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
@@ -2,6 +2,7 @@
 namespace Wikibase\Test;
 
 use FormOptions;
+use User;
 use Wikibase\Client\RecentChanges\RecentChangesFilterOptions;
 use Wikibase\Client\WikibaseClient;
 
@@ -16,20 +17,32 @@
  * @author Marius Hoch < h...@online.de >
  */
 class RecentChangesFilterOptionsTest extends \MediaWikiTestCase {
+   public function setUp() {
+   parent::setUp();
+
+   $user = User::newFromName( 'RecentChangesFilterOptionsTest' );
+   $this->setMwGlobals( 'wgUser', $user );
+   }
+
/**
 * @dataProvider provideShowWikibaseEdits
 *
 * @param bool $expected
 * @param bool $showExternalRecentChanges
 * @param bool $hideWikibase
+* @param bool $useNewRc
 */
public function testShowWikibaseEdits(
$expected,
$showExternalRecentChanges,
-   $hideWikibase
+   $hideWikibase,
+   $useNewRc
) {
+   global $wgUser; // Set by setUp
+
$settings = WikibaseClient::getDefaultInstance()->getSettings();
$oldShowExternal = $settings->getSetting( 
'showExternalRecentChanges' );
+   $wgUser->setOption( 'usenewrc', $useNewRc );
 
$settings->setSetting( 'showExternalRecentChanges', 
$showExternalRecentChanges );
$opts = new FormOptions();
@@ -43,13 +56,36 @@
 
public function provideShowWikibaseEdits() {
return array(
-   array( true, true, false ),
-   // hidewikidata set
-   array( false, true, true ),
-   // showExternalRecentChanges is false
-   array( false, false, false ),
-   // hidewikidata set and showExternalRecentChanges is 
false
-   array( false, false, true ),
+   'Wikibase shown' => array(
+   'expected' => true,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => false,
+   'useNewRc' => false
+   ),
+   'hidewikidata set' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => true,
+   'useNewRc' => false
+   ),
+   'showExternalRecentChanges is false' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => false,
+   'hideWikibase' => false,
+   'useNewRc' => false
+   ),
+   'hidewikidata set and showExternalRecentChanges are 
false' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => false,
+   'hideWikibase' => true,
+   'useNewRc' => false
+   ),
+   'usenewrc user option true' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => false,
+   'useNewRc' => true
+   ),
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeed2fe676a5eb1c1650d37eb706c3d218d00157
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] Nearby: Don't crash on long press if no maps application is ... - change (apps...wikipedia)

2014-10-14 Thread Dbrant (Code Review)

Dbrant has submitted this change and it was merged.

Change subject: Nearby: Don't crash on long press if no maps application is 
present
..


Nearby: Don't crash on long press if no maps application is present

Change-Id: Iff5166b5ce4751a11b277e94ec6986bafcafda2d
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
index 6eae4a3..a4966ca 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
@@ -1,5 +1,6 @@
 package org.wikipedia.nearby;
 
+import android.content.ActivityNotFoundException;
 import org.wikipedia.PageTitle;
 import org.wikipedia.R;
 import org.wikipedia.Site;
@@ -152,7 +153,13 @@
 title.getDisplayText()
 );
 Intent geoIntent = new Intent(Intent.ACTION_VIEW, 
Uri.parse(geoUri));
-startActivity(geoIntent);
+try {
+startActivity(geoIntent);
+} catch (ActivityNotFoundException e) {
+// Means no map application was installed to handle geo://
+// I think this case is rare enough for us to just ignore
+// This would mean long pressing won't do anything, which 
is fine, I think
+}
 return false;
 }
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff5166b5ce4751a11b277e94ec6986bafcafda2d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make scap restart HHVM - change (mediawiki...scap)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Make scap restart HHVM
..


Make scap restart HHVM

If we keep syncing new code without restarting HHVM, HHVM's JIT and PCRE caches
will eventually run out of space, leading HHVM to skip certain optimizations
and eventually crash. To mitigate that, restart the HHVM service when scap is
done. Depends on change I60115d46a in operations/puppet.

Change-Id: Idc01b17ca52922cc71c5e04260c3c098317f6496
---
M scap/main.py
1 file changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/scap/main.py b/scap/main.py
index fec22fe..51c7b6d 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -242,6 +242,17 @@
 '%d hosts had sync_wikiversions errors', failed)
 self.soft_errors = True
 
+# Restart HHVM to reset the JIT cache.
+restart_hhvm = ssh.Job(self._get_apache_list())
+restart_hhvm.shuffle()
+restart_hhvm.command('/usr/bin/test ! -f /etc/init/hhvm.conf || '
+ 'sudo /sbin/restart hhvm')
+succeeded, failed = restart_hhvm.progress('hhvm_restart').run()
+if failed:
+self.get_logger().warning(
+'failed to restart HHVM on %d hosts', failed)
+self.soft_errors = True
+
 def _after_lock_release(self):
 self.announce('Finished scap: %s (duration: %s)',
 self.arguments.message, utils.human_duration(self.get_duration()))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc01b17ca52922cc71c5e04260c3c098317f6496
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] jquery.badge: Swap non-breaking space character for regular ... - change (mediawiki/core)

2014-10-14 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166685

Change subject: jquery.badge: Swap non-breaking space character for regular 
space
..

jquery.badge: Swap non-breaking space character for regular space

Follows-up d453f81f4e. PHP's native json_encode requires input
being a UTF-8 string. For some reason MediaWiki, Git or OS X is
not reading jquery.badge.css as UTF-8 for me.

https://bugs.php.net/bug.php?id=51947

Due to json_encode rejecting the entire value and returning null
instead, the jquery.badge stylesheet was absent. load.php:

 mw.loader.implement("jquery.badge",function, {"css":[null]} );

Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
---
M resources/src/jquery/jquery.badge.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/166685/1

diff --git a/resources/src/jquery/jquery.badge.css 
b/resources/src/jquery/jquery.badge.css
index fa7ea70..34cdf76 100644
--- a/resources/src/jquery/jquery.badge.css
+++ b/resources/src/jquery/jquery.badge.css
@@ -13,7 +13,7 @@
font-weight: bold;
color: white;
vertical-align: baseline;
-   text-shadow: 0 1px rgba(0, 0, 0, 0.4);
+   text-shadow: 0 1px rgba(0, 0, 0, 0.4);
 }
 
 .mw-badge-inline {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Nearby: Don't crash on long press if no maps application is ... - change (apps...wikipedia)

2014-10-14 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166684

Change subject: Nearby: Don't crash on long press if no maps application is 
present
..

Nearby: Don't crash on long press if no maps application is present

Change-Id: Iff5166b5ce4751a11b277e94ec6986bafcafda2d
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/84/166684/1

diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
index 6eae4a3..a4966ca 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
@@ -1,5 +1,6 @@
 package org.wikipedia.nearby;
 
+import android.content.ActivityNotFoundException;
 import org.wikipedia.PageTitle;
 import org.wikipedia.R;
 import org.wikipedia.Site;
@@ -152,7 +153,13 @@
 title.getDisplayText()
 );
 Intent geoIntent = new Intent(Intent.ACTION_VIEW, 
Uri.parse(geoUri));
-startActivity(geoIntent);
+try {
+startActivity(geoIntent);
+} catch (ActivityNotFoundException e) {
+// Means no map application was installed to handle geo://
+// I think this case is rare enough for us to just ignore
+// This would mean long pressing won't do anything, which 
is fine, I think
+}
 return false;
 }
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff5166b5ce4751a11b277e94ec6986bafcafda2d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Nearby: Open an intent with geo:// URL if item is long pressed - change (apps...wikipedia)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Nearby: Open an intent with geo:// URL if item is long pressed
..


Nearby: Open an intent with geo:// URL if item is long pressed

Change-Id: I7f6a2362c8cc10f9cceab72ef84c64c7887bd872
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
index b92f916..6eae4a3 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyActivity.java
@@ -25,6 +25,7 @@
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -137,6 +138,25 @@
 }
 });
 
+// Long click creates an intent for viewing geo:// providers, which
+// opens up in the map application installed
+nearbyList.setOnItemLongClickListener(new 
AdapterView.OnItemLongClickListener() {
+@Override
+public boolean onItemLongClick(AdapterView parent, View view, 
int position, long id) {
+NearbyPage nearbyPage = adapter.getItem(position);
+PageTitle title = new PageTitle(nearbyPage.getTitle(), site, 
nearbyPage.getThumblUrl());
+String geoUri = String.format(Locale.ENGLISH,
+"geo:0,0?q=%s,%s(%s)",
+nearbyPage.getLocation().getLatitude(),
+nearbyPage.getLocation().getLongitude(),
+title.getDisplayText()
+);
+Intent geoIntent = new Intent(Intent.ACTION_VIEW, 
Uri.parse(geoUri));
+startActivity(geoIntent);
+return false;
+}
+});
+
 // Acquire a reference to the system Location Manager
 locationManager = (LocationManager) 
this.getSystemService(Context.LOCATION_SERVICE);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f6a2362c8cc10f9cceab72ef84c64c7887bd872
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Releasing minor version 0.3.0 - change (mediawiki...api)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Releasing minor version 0.3.0
..


Releasing minor version 0.3.0

Release 0.3.0 includes stricter error handling with regard to HTTP
responses and edit-action results.

Bug: 72056
Change-Id: I6f47de1660452d7097413ef9f0b3c3f627f8e6e7
---
M README.md
M lib/mediawiki_api/version.rb
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 091cd2e..a2b8710 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,11 @@
 
 ## Release notes
 
+### 0.3.0 2014-10-14
+
+- HTTP 400 and 500 responses now result in an HttpError exception.
+- Edit failures now result in an EditError exception.
+
 ### 0.2.1 2014-08-26
 
 - Fix error handling for token requests
diff --git a/lib/mediawiki_api/version.rb b/lib/mediawiki_api/version.rb
index ab90bd1..25f5f8f 100644
--- a/lib/mediawiki_api/version.rb
+++ b/lib/mediawiki_api/version.rb
@@ -1,3 +1,3 @@
 module MediawikiApi
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f47de1660452d7097413ef9f0b3c3f627f8e6e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
Gerrit-Branch: master
Gerrit-Owner: Dduvall 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use constant apk file name in Gradle build - change (apps...wikipedia)

2014-10-14 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166683

Change subject: Use constant apk file name in Gradle build
..

Use constant apk file name in Gradle build

We used to have the Gradle build use time stamps in the name.
Having changing apk names causes weird issues in the IDE.
Multiple people have seen cases where Android Studio complained
about the apk file path not being present.
("Local path doesn't exist.")

Also:
* The push option was printing: pushing branch 2.0-beta-2014-10-14
even though we're not creating any branches anymore.
* Also updated the release script to do the renaming of the apk file name
  and to update the docs

Change-Id: Ib4395e52760c5a5b8f79ffe24edd662572d02efe
---
M scripts/make-release.py
M wikipedia/build.gradle
2 files changed, 28 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/83/166683/1

diff --git a/scripts/make-release.py b/scripts/make-release.py
index 3fd0017..2cf70ce 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -8,21 +8,22 @@
 - Runs the selected (clean) Gradle builds (e.g. beta, amazon, or prod and 
releasesprod combined)
 
 Step 2: (e.g., --beta --push):
-- Create an annotated tag called 'releases/versionName'
-- Pushes the git branch and tag created in step 1 to gerrit for history
-- Upload certain bits to releases.mediawiki.org: releasesprod, beta
+- Creates an annotated tag called 'releases/versionName'
+- Pushes the git tag to gerrit for history
+- TODO (Not implemented yet): Uploads certain bits to 
releases.mediawiki.org: releasesprod, beta
 
 To run
 1) tell people on #wikimedia-mobile you're about to bump the version, so hold 
off on merging to master
 2) git checkout master
 3) git pull
 4) git reset --hard
-5) python scripts/make-release.py --prod --releasesprod
-6) manual step: test the apks: adb install -r 
-7) python scripts/make-release.py --prod --releasesprod --push
-8) compile release note using
-git log --graph --date=short `git tag -l beta/*|tail -1`..
-9) Upload apk to store
+5) python scripts/make-release.py --prod
+Note: the apk file locations are printed to stdout
+6) manual step: test the apk(s): adb install -r 
+7) python scripts/make-release.py --prod --push
+8) compile release note of prod using (replace "r/*" with "beta/*" or 
"amazon/*")
+git log --pretty=format:"%h | %cr | %s" --abbrev-commit --no-merges `git 
tag -l r/*|tail -1`..
+9) Upload prod apk to store, releasesprod apk to releases.mediawiki.org
 
 Requires the python module 'sh' to run. Ensure you have a clean working
 directory before running as well.
@@ -48,7 +49,9 @@
 
 def get_release_name(target):
 """
-Returns name release, based on target (in release name) and current date
+Returns name release, based on target (in release name) and current date.
+This should be kept in sync with the versionNames of the various flavors
+in build.gradle.
 """
 return '2.0-%s-%s' % (target, time.strftime('%Y-%m-%d'))
 
@@ -69,14 +72,8 @@
 
 def push_to_gerrit(target):
 """
-Pushes the git branch and tag to gerrit
+Pushes the git tag to gerrit
 """
-release_name = get_release_name(target)
-print('pushing branch ' + release_name)
-sh.git.push('gerrit', 'HEAD:refs/heads/releases/%s' % release_name)
-# don't need to do this?
-# sh.git.push('gerrit', 'HEAD:refs/for/releases/%s' % release_name)
-
 tag_name = get_git_tag_name(target)
 print('pushing tag ' + tag_name)
 sh.git.push('gerrit', tag_name)
@@ -86,9 +83,17 @@
 sh.cd(PATH_PREFIX)
 # ./gradlew -q assembleDevDebug
 args = [GRADLEW, '-q', 'clean']
-tasks = ['assemble{0}Release'.format(i.title()) for i in flavors]
+tasks = ['assemble{0}Release'.format(flavor.title()) for flavor in flavors]
 args += tasks
 subprocess.call(args)
+
+
+def copy_apk(flavor, target):
+folder_path = 'wikipedia/build/outputs/release'
+sh.mkdir("-p", folder_path)
+output_file = '%s/wikipedia-%s.apk' % (folder_path, 
get_release_name(target))
+sh.cp('wikipedia/build/outputs/apk/wikipedia-%s-release.apk' % flavor, 
output_file)
+print ' apk: %s' % output_file
 
 
 def main():
@@ -139,9 +144,12 @@
 push_to_gerrit(target)
 else:
 make_release(flavors)
-print('Please build the APK and test. After that, run w/ --push flag, 
and as needed release the tested APK.')
+copy_apk(flavors[0], targets[0])
+if flavors [0] == 'prod':
+copy_apk(flavors[1], flavors[1])
+print('Please test the APK. After that, run w/ --push flag, and as 
needed release the tested APK.')
 print('A useful command for collecting the release notes:')
-print('git log --pretty=format:"%h %s" --abbrev-commit --no-merges 
..')
+print('git log --pretty=format:"%h | %cr | %s" -

[MediaWiki-commits] [Gerrit] Push microtap to stable. - change (mediawiki...MobileFrontend)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Push microtap to stable.
..


Push microtap to stable.

Remove 300ms delay on iOS

Bug: 46012
Change-Id: I3fb60e9d491261dfe0b3694e90a4883a369394a9
---
M includes/Resources.php
M javascripts/Drawer.js
M javascripts/Overlay.js
M javascripts/application.js
M javascripts/externals/micro.tap.js
M javascripts/loggingSchemas/MobileWebClickTracking.js
M javascripts/loggingSchemas/mobileWebCta.js
M javascripts/mainmenu.js
M javascripts/modules/editor/EditorOverlay.js
M javascripts/modules/editor/EditorOverlayBase.js
M javascripts/modules/editor/editor.js
M javascripts/modules/languages/languages.js
M javascripts/modules/mediaViewer/init.js
M javascripts/modules/notifications/notifications.js
M javascripts/modules/search/SearchOverlay.js
M javascripts/modules/search/search.js
M javascripts/modules/talk/TalkSectionAddOverlay.js
M javascripts/modules/talk/TalkSectionOverlay.js
M javascripts/modules/toc/toc.js
M javascripts/modules/toggling/toggle.js
M javascripts/modules/tutorials/newbieEditor.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/modules/uploads/PhotoUploadProgress.js
M javascripts/modules/uploads/UploadTutorial.js
M tests/qunit/modules/toggling/test_toggle.js
25 files changed, 48 insertions(+), 71 deletions(-)

Approvals:
  Robmoen: Looks good to me, approved
  Bmansurov: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Resources.php b/includes/Resources.php
index 8fca9ac..9c3383c 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -423,7 +423,6 @@
'mobile.wikigrok',
),
'scripts' => array(
-   'javascripts/externals/micro.tap.js',
'javascripts/modules/languages/preferred.js',
),
'position' => 'bottom',
@@ -621,6 +620,7 @@
'ctaDrawer.hogan',
),
'scripts' => array(
+   'javascripts/externals/micro.tap.js',
'javascripts/modules/routes.js',
'javascripts/Drawer.js',
'javascripts/CtaDrawer.js',
diff --git a/javascripts/Drawer.js b/javascripts/Drawer.js
index ca18f3f..28209ab 100644
--- a/javascripts/Drawer.js
+++ b/javascripts/Drawer.js
@@ -17,12 +17,11 @@
Panel.prototype.postRender.apply( this, arguments );
this.on( 'show', function() {
setTimeout( function() {
-   $( 'body' ).one( M.tapEvent( 'click' ) 
+ '.drawer', $.proxy( self, 'hide' ) );
+   $( 'body' ).one( 'tap.drawer', $.proxy( 
self, 'hide' ) );
$( window ).one( 'scroll.drawer', 
$.proxy( self, 'hide' ) );
-   // FIXME change when micro.tap.js in 
stable
// can't use 'body' because the drawer 
will be closed when
// tapping on it and clicks will be 
prevented
-   $( '#mw-mf-page-center' ).one( 
M.tapEvent( 'click' ) + '.drawer', $.proxy( self, 'hide' ) );
+   $( '#mw-mf-page-center' ).one( 
'tap.drawer', $.proxy( self, 'hide' ) );
}, self.minHideDelay );
} );
 
@@ -34,7 +33,7 @@
} );
 
// Allow the drawer itself to be clickable (e.g. for 
copying and pasting references / clicking links in reference)
-   this.$el.on( M.tapEvent( 'click' ), function( ev ) {
+   this.$el.on( 'tap', function( ev ) {
ev.stopPropagation();
} );
}
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index 00a467a..6d1d159 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -60,9 +60,8 @@
 
// Truncate any text inside in the overlay header.
this.$( '.overlay-header h2 span' ).addClass( 
'truncated-text' );
-   // FIXME change when micro.tap.js in stable
// FIXME: Remove .initial-header selector when bug 
71203 resolved.
-   this.$( '.cancel, .confirm, .initial-header .back' 
).on( M.tapEvent( 'click' ), function( ev ) {
+   this.$( '.cancel, .confirm, .initial-header .back' 
).on( 'tap', function( ev ) {
ev.preventDefault();
ev.stopPropagation();
if ( self.closeOnBack ) {
@@ -73,7 +72,7 @@
} );
// st

[MediaWiki-commits] [Gerrit] Remove n...@email.com from WP form - change (mediawiki...DonationInterface)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Remove n...@email.com from WP form
..


Remove n...@email.com from WP form

Change-Id: I90b76c47f108d1d1ac37009c95b0e9bb8f845c88
---
M worldpay_gateway/forms/html/_personal-information/default.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/worldpay_gateway/forms/html/_personal-information/default.html 
b/worldpay_gateway/forms/html/_personal-information/default.html
index d2bd667..a74d235 100644
--- a/worldpay_gateway/forms/html/_personal-information/default.html
+++ b/worldpay_gateway/forms/html/_personal-information/default.html
@@ -20,7 +20,7 @@
 
 
%donate_interface-donor-email%
-   
+   

 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90b76c47f108d1d1ac37009c95b0e9bb8f845c88
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] QA: fix tests for new lock/unlock reason behavior - change (mediawiki...Flow)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: QA: fix tests for new lock/unlock reason behavior
..


QA: fix tests for new lock/unlock reason behavior

With this, tests pass in Firefox against ee-flow.

Change-Id: I513bf573d463098549ffed2b91a0c788bf9b2365
---
M tests/browser/features/lock_unlock_topics.feature
M tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
M tests/browser/features/support/pages/flow_page.rb
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/tests/browser/features/lock_unlock_topics.feature 
b/tests/browser/features/lock_unlock_topics.feature
index 6962131..a10071d 100644
--- a/tests/browser/features/lock_unlock_topics.feature
+++ b/tests/browser/features/lock_unlock_topics.feature
@@ -32,7 +32,7 @@
 And I type "This is a bikeshed" as the reason
 And I submit the lock/unlock topic form
 Then the top post is a locked discussion
-And the topic summary of the first topic is "This is a bikeshed"
+And the reason of the first topic is "This is a bikeshed"
 And the content of the top post should be visible
 
   # Close-then-unlock doesn't work in IE, it caches the API response (bug 
69160).
@@ -45,5 +45,4 @@
 When I type "Fun discussion" as the reason
 And I submit the lock/unlock topic form
 Then the top post is an open discussion
-And the topic summary of the first topic is "Fun discussion"
 And the content of the top post should be visible
diff --git 
a/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb 
b/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
index 1d57c69..c6f3da0 100644
--- a/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
+++ b/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
@@ -40,8 +40,8 @@
   on(FlowPage).flow_first_topic_moderation_msg_element.when_not_present
 end
 
-Then(/^the topic summary of the first topic is "(.*?)"$/) do |text|
-  on(FlowPage).flow_first_topic_summary_element.text.should match text
+Then(/^the reason of the first topic is "(.*?)"$/) do |text|
+  on(FlowPage).flow_reason_element.text.should match text
 end
 
 Then(/^I expand the top post$/) do
diff --git a/tests/browser/features/support/pages/flow_page.rb 
b/tests/browser/features/support/pages/flow_page.rb
index 0c6d19b..e6e7fe0 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -128,6 +128,7 @@
   textarea(:topic_lock_form_reason, css: ".flow-edit-form textarea")
   button(:topic_lock_form_lock_button, css: ".flow-edit-form 
.mw-ui-constructive")
   button(:topic_lock_form_cancel_button, css: ".flow-edit-form 
.mw-ui-destructive")
+  div(:flow_reason, class: "flow-moderated-topic-reason")
 
   ### Editing title of first topic
   text_field(:title_edit, css: ".flow-topic-titlebar form .mw-ui-input", 
index: 0)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I513bf573d463098549ffed2b91a0c788bf9b2365
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Removed extra "tries" increment in the redis job queue - change (mediawiki...jobrunner)

2014-10-14 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166681

Change subject: Removed extra "tries" increment in the redis job queue
..

Removed extra "tries" increment in the redis job queue

* This could result in jobs getting one less extra tries than they should

Change-Id: I2b8afa93bd9a1092c36ace7c700d4538b0eb95db
---
M redisJobRunnerService
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner 
refs/changes/81/166681/1

diff --git a/redisJobRunnerService b/redisJobRunnerService
index 6c07946..432a447 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -415,7 +415,6 @@
if attempts < rAttempts then
-- Claim expired and attempts left: re-enqueue 
the job
redis.call('lPush',kUnclaimed,id)
-   redis.call('hIncrBy',kAttempts,id,1)
released = released + 1
else
-- Claim expired and no attempts left: mark the 
job as dead

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b8afa93bd9a1092c36ace7c700d4538b0eb95db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Removed extra "tries" increment in the redis job queue - change (mediawiki/core)

2014-10-14 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166680

Change subject: Removed extra "tries" increment in the redis job queue
..

Removed extra "tries" increment in the redis job queue

* This could result in jobs getting one less extra tries than they should

Change-Id: Ia2e82ca0965f6ce9e1354820eb03f40f047a949c
---
M includes/jobqueue/JobQueueRedis.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/166680/1

diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index 3519eac..33be76b 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -658,7 +658,6 @@
if attempts < ARGV[3] then
-- Claim expired and retries left: 
re-enqueue the job
redis.call('lPush',kUnclaimed,id)
-   redis.call('hIncrBy',kAttempts,id,1)
released = released + 1
else
-- Claim expired and no retries left: 
mark the job as dead

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2e82ca0965f6ce9e1354820eb03f40f047a949c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Remove jstorage.js fork
..


Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 4 insertions(+), 215 deletions(-)

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



diff --git a/Collection.php b/Collection.php
index 6e4e63c..181f7cc 100644
--- a/Collection.php
+++ b/Collection.php
@@ -211,9 +211,9 @@
 );
 
 $wgResourceModules += array(
+   // For backwards compatibility / race condition after removing 
js/jstorage.js
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -230,12 +230,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-   },
-
-

[MediaWiki-commits] [Gerrit] Releasing minor version 0.3.0 - change (mediawiki...api)

2014-10-14 Thread Dduvall (Code Review)

Dduvall has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166679

Change subject: Releasing minor version 0.3.0
..

Releasing minor version 0.3.0

Release 0.3.0 includes stricter error handling with regard to HTTP
responses and edit-action results.

Bug: 72056
Change-Id: I6f47de1660452d7097413ef9f0b3c3f627f8e6e7
---
M README.md
M lib/mediawiki_api/version.rb
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api 
refs/changes/79/166679/1

diff --git a/README.md b/README.md
index 091cd2e..a2b8710 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,11 @@
 
 ## Release notes
 
+### 0.3.0 2014-10-14
+
+- HTTP 400 and 500 responses now result in an HttpError exception.
+- Edit failures now result in an EditError exception.
+
 ### 0.2.1 2014-08-26
 
 - Fix error handling for token requests
diff --git a/lib/mediawiki_api/version.rb b/lib/mediawiki_api/version.rb
index ab90bd1..25f5f8f 100644
--- a/lib/mediawiki_api/version.rb
+++ b/lib/mediawiki_api/version.rb
@@ -1,3 +1,3 @@
 module MediawikiApi
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f47de1660452d7097413ef9f0b3c3f627f8e6e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
Gerrit-Branch: master
Gerrit-Owner: Dduvall 

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

[MediaWiki-commits] [Gerrit] WIP: Penalize toxic card IPs in velocity filter - change (mediawiki...DonationInterface)

2014-10-14 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166678

Change subject: WIP: Penalize toxic card IPs in velocity filter
..

WIP: Penalize toxic card IPs in velocity filter

Change-Id: I1158d3d334138ed96d97fd76c8f346171ba6ed8e
---
M extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
M globalcollect_gateway/globalcollect.adapter.php
2 files changed, 22 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/78/166678/1

diff --git a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php 
b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
index 9188c4a..eb51761 100644
--- a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
+++ b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
@@ -166,4 +166,19 @@
return self::$instance;
}
 
+   /**
+* Add a hit to this IP's history for a toxic card.  This is designed 
to be
+* called outside of the usual filter callbacks so we record nasty 
attempts
+* even when the filters aren't called.
+*/
+   public static function penalize( &$gateway ) {
+   $velocity = Gateway_Extras_CustomFilters_IP_Velocity::singleton(
+   $gateway,
+   Gateway_Extras_CustomFilters::singleton( $gateway )
+   );
+   if ( $velocity->connectToMemcache() ) {
+   $velocity->addNowToMemcachedValue( null, false, true );
+   }
+   }
+
 }
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index 1b99584..cd27e9b 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1767,11 +1767,16 @@
$retErrCode = $errCode;
break;
case 430260: //wow: If we were a point of sale, 
we'd be calling security.
+   case 430357: //lost or stolen card
+   // These two get all the cancel 
treatment below, plus some extra
+   // IP velocity spanking.
+   if ( $this->getGlobal( 
'EnableIPVelocityFilter' ) ) {
+   
Gateway_Extras_CustomFilters_IP_Velocity::penalize( $this );
+   }
case 430306: //Expired card.
case 430330: //invalid card number
case 430354: //issuer unknown
-   case 430357: //lost or stolen card
-   // All of these should stop us from 
retrying at all
+   // All five these should stop us from 
retrying at all
// Null out the retry vars and return 
immediately
$retryVars = null;
$this->setTransactionResult( true, 
'force_cancel' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1158d3d334138ed96d97fd76c8f346171ba6ed8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Fix cleaning up while running the tests - change (mediawiki...latex_renderer)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166677

Change subject: Fix cleaning up while running the tests
..

Fix cleaning up while running the tests

 * Looks like this was introduced in change,
   I295cb3a0b112e6d6c512c845cc17e3118f477c50

Bug: 71341
Change-Id: I91ce465112665c858f4acf8f1c35d1b5857bfc9f
---
M lib/index.js
M test/samples.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
 refs/changes/77/166677/1

diff --git a/lib/index.js b/lib/index.js
index 4def383..adb59e1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1381,7 +1381,7 @@
return P.call(tmp.dir, tmp, {
prefix: json.name,
dir: options.tmpdir,
-   unsafeCleanup: !(options.debug || options.latex)
+   unsafeCleanup: !options.debug
}).then(function(_builddir) {
builddir = _builddir;
// make bundle and latex subdirs
@@ -1412,7 +1412,7 @@
return P.call(tmp.dir, tmp, {
prefix: json.name,
dir: options.tmpdir,
-   unsafeCleanup: !(options.debug || options.latex)
+   unsafeCleanup: !options.debug
}).then(function(_builddir) {
builddir = _builddir;
// make latex subdir
diff --git a/test/samples.js b/test/samples.js
index df9808d..1f2583c 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -44,7 +44,7 @@
bundle: filename,
output: filename + '.' + dest,
size: 'letter',
-   latex: !hasXeLaTeX,
+   latex: hasXeLaTeX,
skipJpegtran: !hasJpegtran,
log: function() { /* suppress logging 
*/ }
}).then(function(_) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ce465112665c858f4acf8f1c35d1b5857bfc9f
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Compress text/javascript as well - change (operations/puppet)

2014-10-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: dynamicproxy: Compress text/javascript as well
..


dynamicproxy: Compress text/javascript as well

 application/javascript is a standards hipster thing "nobody"
uses that.

Change-Id: I91c83b557b3af3977919412325c9bb950480e88f
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/urlproxy.conf
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/dynamicproxy/templates/domainproxy.conf 
b/modules/dynamicproxy/templates/domainproxy.conf
index 44a3390..98c204a 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -95,5 +95,5 @@
 # GZIP (ALMOST) ALL THE THINGS!
 gzip on;
 gzip_proxied any;
-gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript;
+gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript text/javascript;
 }
diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index c9863b6..45e1704 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -99,6 +99,6 @@
 # GZIP ALL THE THINGS!
 gzip on;
 gzip_proxied any;
-gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript;
+gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript text/javascript;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91c83b557b3af3977919412325c9bb950480e88f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Compress text/javascript as well - change (operations/puppet)

2014-10-14 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166676

Change subject: dynamicproxy: Compress text/javascript as well
..

dynamicproxy: Compress text/javascript as well

 application/javascript is a standards hipster thing "nobody"
uses that.

Change-Id: I91c83b557b3af3977919412325c9bb950480e88f
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/urlproxy.conf
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/166676/1

diff --git a/modules/dynamicproxy/templates/domainproxy.conf 
b/modules/dynamicproxy/templates/domainproxy.conf
index 44a3390..98c204a 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -95,5 +95,5 @@
 # GZIP (ALMOST) ALL THE THINGS!
 gzip on;
 gzip_proxied any;
-gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript;
+gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript text/javascript;
 }
diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index c9863b6..45e1704 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -99,6 +99,6 @@
 # GZIP ALL THE THINGS!
 gzip on;
 gzip_proxied any;
-gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript;
+gzip_types text/plain text/css text/xml application/json 
application/javascript application/x-javascript text/javascript;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c83b557b3af3977919412325c9bb950480e88f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Cache instance lists for 1 minute when called via API - change (mediawiki...OpenStackManager)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Cache instance lists for 1 minute when called via API
..


Cache instance lists for 1 minute when called via API

- No invalidation, but that's ok. Invalidation is hard
  because not all operations have to go through wikitech.
- This is primarily an anti DDoS measure.

Change-Id: I1b56ba9688315b5b4ca17ad527db5e8f5e9c2393
---
M api/ApiListNovaInstances.php
1 file changed, 27 insertions(+), 16 deletions(-)

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



diff --git a/api/ApiListNovaInstances.php b/api/ApiListNovaInstances.php
index b369339..5350a20 100644
--- a/api/ApiListNovaInstances.php
+++ b/api/ApiListNovaInstances.php
@@ -17,6 +17,7 @@
public function run() {
global $wgOpenStackManagerLDAPUsername;
global $wgOpenStackManagerLDAPUserPassword;
+   global $wgMemc;
 
$params = $this->extractRequestParams();
$project = OpenStackNovaProject::getProjectByName( 
$params['project'] );
@@ -25,25 +26,35 @@
$this->dieUsage( 'Invalid project specified.', 
'badproject' );
}
 
-   $user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername 
);
-   $userNova = OpenStackNovaController::newFromUser( $user );
-   $userNova->authenticate( $wgOpenStackManagerLDAPUsername, 
$wgOpenStackManagerLDAPUserPassword );
+   $key = wfMemcKey( 'openstackmanager', 'apilistnovainstances', 
$params['region'], $params['project'] );
+   $instancesInfo = $wgMemc->get( $key );
+   if ( $instancesInfo === false ) {
+   $user = new OpenStackNovaUser( 
$wgOpenStackManagerLDAPUsername );
+   $userNova = OpenStackNovaController::newFromUser( $user 
);
+   $userNova->authenticate( 
$wgOpenStackManagerLDAPUsername, $wgOpenStackManagerLDAPUserPassword );
 
-   $userNova->setProject( $project->getName() );
-   $userNova->setRegion( $params['region'] ); // validated by API
+   $userNova->setProject( $project->getName() );
+   $userNova->setRegion( $params['region'] ); // validated 
by API
 
-   $instances = $userNova->getInstances();
-   foreach ( $instances as $instance ) {
-   $info = array(
-   'name' => $instance->getInstanceName(),
-   'state' => $instance->getInstanceState(),
-   'ip' => $instance->getInstancePrivateIPs(),
-   'id' => $instance->getInstanceId(),
-   'floatingip' => 
$instance->getInstancePublicIPs(),
-   'securitygroups' => 
$instance->getSecurityGroups(),
-   'imageid' => $instance->getImageId(),
-   );
+   $instances = $userNova->getInstances();
+   $instancesInfo = array();
+   foreach ( $instances as $instance ) {
+   $instancesInfo[ ] = array(
+   'name' => $instance->getInstanceName(),
+   'state' => 
$instance->getInstanceState(),
+   'ip' => 
$instance->getInstancePrivateIPs(),
+   'id' => $instance->getInstanceId(),
+   'floatingip' => 
$instance->getInstancePublicIPs(),
+   'securitygroups' => 
$instance->getSecurityGroups(),
+   'imageid' => $instance->getImageId(),
+   );
+   }
+   }
 
+   // Cache info for 1 minute, not caching for longer since we do 
not invalidate
+   $wgMemc->set( $key, $instancesInfo, 1 * 60 );
+
+   foreach ( $instancesInfo as $info ) {
// UGH I hate XML
$this->getResult()->setIndexedTagName( 
$info['securitygroups'], 'group' );
$this->getResult()->setIndexedTagName( $info['ip'], 
'ip' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b56ba9688315b5b4ca17ad527db5e8f5e9c2393
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Return background and foreground color with message - change (mediawiki...ZeroBanner)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Return background and foreground color with message
..


Return background and foreground color with message

This will make it so custom colored croutons can be shown in the apps.

Change-Id: Ia38ea3c0d863da254df58323ab7ad2aafe6ddf07
---
M includes/ApiZeroBanner.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Jhobs: Looks good to me, but someone else must approve
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ApiZeroBanner.php b/includes/ApiZeroBanner.php
index ec1a08e..1ab84f4 100644
--- a/includes/ApiZeroBanner.php
+++ b/includes/ApiZeroBanner.php
@@ -86,6 +86,8 @@
$text = $state->getBannerText( $config 
);
if ( $text ) {
$result->addValue( $moduleName, 
'message', $text );
+   $result->addValue( $moduleName, 
'background', $config->background() );
+   $result->addValue( $moduleName, 
'foreground', $config->foreground() );
}
}
// else json_encode will ultimately return as 
an empty array

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia38ea3c0d863da254df58323ab7ad2aafe6ddf07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt 
Gerrit-Reviewer: Dr0ptp4kt 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166675

Change subject: Remove jstorage.js fork
..

Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 4 insertions(+), 215 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/75/166675/1

diff --git a/Collection.php b/Collection.php
index c353fcd..ec78fd6 100644
--- a/Collection.php
+++ b/Collection.php
@@ -206,9 +206,9 @@
 );
 
 $wgResourceModules += array(
+   // For backwards compatibility / race condition after removing 
js/jstorage.js
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -225,12 +225,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-

[MediaWiki-commits] [Gerrit] Fix and enhance RecentChangesFilterOptionsTest - change (mediawiki...Wikibase)

2014-10-14 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166674

Change subject: Fix and enhance RecentChangesFilterOptionsTest
..

Fix and enhance RecentChangesFilterOptionsTest

By explicitly setting the user usenewrc user option.
This is needed after I0736f82ed8f7 changed the default for that
user option.

Change-Id: Ieeed2fe676a5eb1c1650d37eb706c3d218d00157
---
M client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
1 file changed, 44 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/74/166674/1

diff --git 
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
 
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
index 198efdf..f4cc221 100644
--- 
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
+++ 
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
@@ -2,6 +2,7 @@
 namespace Wikibase\Test;
 
 use FormOptions;
+use User;
 use Wikibase\Client\RecentChanges\RecentChangesFilterOptions;
 use Wikibase\Client\WikibaseClient;
 
@@ -16,20 +17,32 @@
  * @author Marius Hoch < h...@online.de >
  */
 class RecentChangesFilterOptionsTest extends \MediaWikiTestCase {
+   public function setUp() {
+   parent::setUp();
+
+   $user = User::newFromName( 'RecentChangesFilterOptionsTest' );
+   $this->setMwGlobals( 'wgUser', $user );
+   }
+
/**
 * @dataProvider provideShowWikibaseEdits
 *
 * @param bool $expected
 * @param bool $showExternalRecentChanges
 * @param bool $hideWikibase
+* @param bool $useNewRc
 */
public function testShowWikibaseEdits(
$expected,
$showExternalRecentChanges,
-   $hideWikibase
+   $hideWikibase,
+   $useNewRc
) {
+   global $wgUser; // Set by setUp
+
$settings = WikibaseClient::getDefaultInstance()->getSettings();
$oldShowExternal = $settings->getSetting( 
'showExternalRecentChanges' );
+   $wgUser->setOption( 'usenewrc', $useNewRc );
 
$settings->setSetting( 'showExternalRecentChanges', 
$showExternalRecentChanges );
$opts = new FormOptions();
@@ -43,13 +56,36 @@
 
public function provideShowWikibaseEdits() {
return array(
-   array( true, true, false ),
-   // hidewikidata set
-   array( false, true, true ),
-   // showExternalRecentChanges is false
-   array( false, false, false ),
-   // hidewikidata set and showExternalRecentChanges is 
false
-   array( false, false, true ),
+   'Wikibase shown' => array(
+   'expected' => true,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => false,
+   'useNewRc' => false
+   ),
+   'hidewikidata set' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => true,
+   'useNewRc' => false
+   ),
+   'showExternalRecentChanges is false' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => false,
+   'hideWikibase' => false,
+   'useNewRc' => false
+   ),
+   'hidewikidata set and showExternalRecentChanges are 
false' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => false,
+   'hideWikibase' => true,
+   'useNewRc' => false
+   ),
+   'usenewrc user option true' => array(
+   'expected' => false,
+   'showExternalRecentChanges' => true,
+   'hideWikibase' => false,
+   'useNewRc' => true
+   ),
);
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeed2fe676a5eb1c1650d37eb706c3d218d00157
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

___

[MediaWiki-commits] [Gerrit] labs beta: make a class that explicitly has test repo plus f... - change (operations/puppet)

2014-10-14 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: labs beta: make a class that explicitly has test repo plus ferm 
ssh rule
..


labs beta: make a class that explicitly has test repo plus ferm ssh rule

this makes sure that the deployment bastion has ssh access to
any beta instance with the trebuchet testrepo

Change-Id: Idd35bf7aa73120b1aec3e4199ebf12a13ae04f13
---
M manifests/role/beta.pp
1 file changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 154bdab..d44b1d0 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -78,6 +78,20 @@
 # not communicate with that host.
 }
 
+class role::beta::trebuchet_testing {
+system::role { 'role::beta::trebuchet_testing':
+description => 'Trebuchet testing host'
+}
+
+include ::role::deployment::test
+
+# Allow ssh inbound from deployment-bastion.eqiad.wmflabs for testing
+ferm::rule { 'deployment-bastion-trebuchet-testing-ssh':
+ensure  => present,
+rule=> "proto tcp dport ssh saddr ${::beta::config::bastion_ip} 
ACCEPT;",
+}
+}
+
 class role::beta::appserver {
 system::role { 'role::beta::appserver': }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd35bf7aa73120b1aec3e4199ebf12a13ae04f13
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs beta: make a class that explicitly has test repo plus f... - change (operations/puppet)

2014-10-14 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166672

Change subject: labs beta: make a class that explicitly has test repo plus ferm 
ssh rule
..

labs beta: make a class that explicitly has test repo plus ferm ssh rule

this makes sure that the deployment bastion has ssh access to
any beta instance with the trebuchet testrepo

Change-Id: Idd35bf7aa73120b1aec3e4199ebf12a13ae04f13
---
M manifests/role/beta.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/166672/1

diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 154bdab..d44b1d0 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -78,6 +78,20 @@
 # not communicate with that host.
 }
 
+class role::beta::trebuchet_testing {
+system::role { 'role::beta::trebuchet_testing':
+description => 'Trebuchet testing host'
+}
+
+include ::role::deployment::test
+
+# Allow ssh inbound from deployment-bastion.eqiad.wmflabs for testing
+ferm::rule { 'deployment-bastion-trebuchet-testing-ssh':
+ensure  => present,
+rule=> "proto tcp dport ssh saddr ${::beta::config::bastion_ip} 
ACCEPT;",
+}
+}
+
 class role::beta::appserver {
 system::role { 'role::beta::appserver': }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd35bf7aa73120b1aec3e4199ebf12a13ae04f13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] Cache instance lists for 5 minutes when called via API - change (mediawiki...OpenStackManager)

2014-10-14 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166673

Change subject: Cache instance lists for 5 minutes when called via API
..

Cache instance lists for 5 minutes when called via API

Change-Id: I1b56ba9688315b5b4ca17ad527db5e8f5e9c2393
---
M api/ApiListNovaInstances.php
1 file changed, 26 insertions(+), 16 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/73/166673/1

diff --git a/api/ApiListNovaInstances.php b/api/ApiListNovaInstances.php
index b369339..8a637e2 100644
--- a/api/ApiListNovaInstances.php
+++ b/api/ApiListNovaInstances.php
@@ -17,6 +17,7 @@
public function run() {
global $wgOpenStackManagerLDAPUsername;
global $wgOpenStackManagerLDAPUserPassword;
+   global $wgMemc;
 
$params = $this->extractRequestParams();
$project = OpenStackNovaProject::getProjectByName( 
$params['project'] );
@@ -25,25 +26,34 @@
$this->dieUsage( 'Invalid project specified.', 
'badproject' );
}
 
-   $user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername 
);
-   $userNova = OpenStackNovaController::newFromUser( $user );
-   $userNova->authenticate( $wgOpenStackManagerLDAPUsername, 
$wgOpenStackManagerLDAPUserPassword );
+   $key = wfMemcKey( 'openstackmanager', 'apilistnovainstances', 
$param['region'], $param['project'] );
+   $instancesInfo = $wgMemc->get( $key );
+   if ( $instancesInfo === false ) {
+   $user = new 
OpenStackNovaUser($wgOpenStackManagerLDAPUsername);
+   $userNova = OpenStackNovaController::newFromUser($user);
+   
$userNova->authenticate($wgOpenStackManagerLDAPUsername, 
$wgOpenStackManagerLDAPUserPassword);
 
-   $userNova->setProject( $project->getName() );
-   $userNova->setRegion( $params['region'] ); // validated by API
+   $userNova->setProject($project->getName());
+   $userNova->setRegion($params['region']); // validated 
by API
 
-   $instances = $userNova->getInstances();
-   foreach ( $instances as $instance ) {
-   $info = array(
-   'name' => $instance->getInstanceName(),
-   'state' => $instance->getInstanceState(),
-   'ip' => $instance->getInstancePrivateIPs(),
-   'id' => $instance->getInstanceId(),
-   'floatingip' => 
$instance->getInstancePublicIPs(),
-   'securitygroups' => 
$instance->getSecurityGroups(),
-   'imageid' => $instance->getImageId(),
-   );
+   $instances = $userNova->getInstances();
+   $instancesInfo = array();
+   foreach ($instances as $instance) {
+   $instancesInfo[] = array(
+   'name' => $instance->getInstanceName(),
+   'state' => 
$instance->getInstanceState(),
+   'ip' => 
$instance->getInstancePrivateIPs(),
+   'id' => $instance->getInstanceId(),
+   'floatingip' => 
$instance->getInstancePublicIPs(),
+   'securitygroups' => 
$instance->getSecurityGroups(),
+   'imageid' => $instance->getImageId(),
+   );
+   }
+   }
 
+   $wgMemc->set( $key, $instancesInfo, 5 * 60 ); // Cache for 5 
minutes
+
+   foreach( $instancesInfo as $info ) {
// UGH I hate XML
$this->getResult()->setIndexedTagName( 
$info['securitygroups'], 'group' );
$this->getResult()->setIndexedTagName( $info['ip'], 
'ip' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b56ba9688315b5b4ca17ad527db5e8f5e9c2393
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] QA: make tests green with new lock/unlock reason behavior - change (mediawiki...Flow)

2014-10-14 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166671

Change subject: QA: make tests green with new lock/unlock reason behavior
..

QA: make tests green with new lock/unlock reason behavior

Change-Id: I513bf573d463098549ffed2b91a0c788bf9b2365
---
M tests/browser/features/lock_unlock_topics.feature
M tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
M tests/browser/features/support/pages/flow_page.rb
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/71/166671/1

diff --git a/tests/browser/features/lock_unlock_topics.feature 
b/tests/browser/features/lock_unlock_topics.feature
index 6962131..e53f558 100644
--- a/tests/browser/features/lock_unlock_topics.feature
+++ b/tests/browser/features/lock_unlock_topics.feature
@@ -32,7 +32,7 @@
 And I type "This is a bikeshed" as the reason
 And I submit the lock/unlock topic form
 Then the top post is a locked discussion
-And the topic summary of the first topic is "This is a bikeshed"
+And the Reason of the first topic is "This is a bikeshed"
 And the content of the top post should be visible
 
   # Close-then-unlock doesn't work in IE, it caches the API response (bug 
69160).
@@ -45,5 +45,4 @@
 When I type "Fun discussion" as the reason
 And I submit the lock/unlock topic form
 Then the top post is an open discussion
-And the topic summary of the first topic is "Fun discussion"
 And the content of the top post should be visible
diff --git 
a/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb 
b/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
index 1d57c69..f9cfb78 100644
--- a/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
+++ b/tests/browser/features/step_definitions/lock_unlock_topics_steps.rb
@@ -40,8 +40,8 @@
   on(FlowPage).flow_first_topic_moderation_msg_element.when_not_present
 end
 
-Then(/^the topic summary of the first topic is "(.*?)"$/) do |text|
-  on(FlowPage).flow_first_topic_summary_element.text.should match text
+Then(/^the Reason of the first topic is "(.*?)"$/) do |text|
+  on(FlowPage).flow_reason_element.text.should match text
 end
 
 Then(/^I expand the top post$/) do
diff --git a/tests/browser/features/support/pages/flow_page.rb 
b/tests/browser/features/support/pages/flow_page.rb
index 0c6d19b..e6e7fe0 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -128,6 +128,7 @@
   textarea(:topic_lock_form_reason, css: ".flow-edit-form textarea")
   button(:topic_lock_form_lock_button, css: ".flow-edit-form 
.mw-ui-constructive")
   button(:topic_lock_form_cancel_button, css: ".flow-edit-form 
.mw-ui-destructive")
+  div(:flow_reason, class: "flow-moderated-topic-reason")
 
   ### Editing title of first topic
   text_field(:title_edit, css: ".flow-topic-titlebar form .mw-ui-input", 
index: 0)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I513bf573d463098549ffed2b91a0c788bf9b2365
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ed33c25..7686be0 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: ed33c25..7686be0
..


Syncronize VisualEditor: ed33c25..7686be0

Change-Id: I8087dc59c71baf4fb4eababecba34664c612869e
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index ed33c25..7686be0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit ed33c2583c0847a1b73e4f99a3e1cddebf34ec94
+Subproject commit 7686be00c4a6847cc193276742558a8e9977c0a1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8087dc59c71baf4fb4eababecba34664c612869e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ed33c25..7686be0 - change (mediawiki/extensions)

2014-10-14 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166670

Change subject: Syncronize VisualEditor: ed33c25..7686be0
..

Syncronize VisualEditor: ed33c25..7686be0

Change-Id: I8087dc59c71baf4fb4eababecba34664c612869e
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/70/166670/1

diff --git a/VisualEditor b/VisualEditor
index ed33c25..7686be0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit ed33c2583c0847a1b73e4f99a3e1cddebf34ec94
+Subproject commit 7686be00c4a6847cc193276742558a8e9977c0a1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8087dc59c71baf4fb4eababecba34664c612869e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] pagefromfile.py: pep257 and optimisation - change (pywikibot/core)

2014-10-14 Thread Mpaa (Code Review)

Mpaa has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/13

Change subject: pagefromfile.py: pep257 and optimisation
..

pagefromfile.py: pep257 and optimisation

Closed hanging file.
Used PageSaveRelatedError.

Change-Id: Ic2da03cac8e3939549fa6bd074539213ee594907
---
M scripts/pagefromfile.py
1 file changed, 21 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/63/13/1

diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index 98df996..6b8441f 100644
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # -*- coding: utf-8  -*-
 """
+Bot to upload pages from a file.
+
 This bot takes its input from a file that contains a number of
 pages to be put on the wiki. The pages should all have the same
 begin and end text (which may not overlap).
@@ -65,17 +67,21 @@
 """No title found."""
 
 def __init__(self, offset):
+"""Constructor."""
 self.offset = offset
 
 
 class PageFromFileRobot(Bot):
 
 """
-Responsible for writing pages to the wiki, with the titles and contents
-given by a PageFromFileReader.
+Responsible for writing pages to the wiki.
+
+Titles and contents are given by a PageFromFileReader.
+
 """
 
 def __init__(self, reader, **kwargs):
+"""Constructor."""
 self.availableOptions.update({
 'force': False,
 'append': None,
@@ -90,10 +96,12 @@
 self.reader = reader
 
 def run(self):
+"""Start file processing and upload content."""
 for title, contents in self.reader.run():
 self.save(title, contents)
 
 def save(self, title, contents):
+"""Upload page content."""
 mysite = pywikibot.Site()
 
 page = pywikibot.Page(mysite, title)
@@ -145,17 +153,13 @@
 if self.getOption('autosummary'):
 comment = ''
 config.default_edit_summary = ''
+
 try:
 page.text = contents
 page.save(comment, minor=self.getOption('minor'))
-except pywikibot.LockedPage:
-pywikibot.output(u"Page %s is locked; skipping." % title)
-except pywikibot.EditConflict:
-pywikibot.output(u'Skipping %s because of edit conflict' % title)
-except pywikibot.SpamfilterError as error:
-pywikibot.output(
-u'Cannot change %s because of spam blacklist entry %s'
-% (title, error.url))
+except pywikibot.PageSaveRelatedError as error:
+pywikibot.output(u'Page %s not saved: %s'
+ % (self.current_page.title(asLink=True), error))
 
 
 class PageFromFileReader:
@@ -170,11 +174,11 @@
 def __init__(self, filename, pageStartMarker, pageEndMarker,
  titleStartMarker, titleEndMarker, include, notitle):
 """Constructor.
+
 Check if self.file name exists. If not, ask for a new filename.
 User can quit.
 
 """
-
 self.filename = filename
 self.pageStartMarker = pageStartMarker
 self.pageEndMarker = pageEndMarker
@@ -187,13 +191,14 @@
 """Read file and yield page title and content."""
 pywikibot.output('\n\nReading \'%s\'...' % self.filename)
 try:
-f = codecs.open(self.filename, 'r',
-encoding=config.textfile_encoding)
+with codecs.open(self.filename, 'r',
+ encoding=config.textfile_encoding) as f:
+text = f.read()
+
 except IOError as err:
 pywikibot.output(str(err))
 raise IOError
 
-text = f.read()
 position = 0
 length = 0
 while True:
@@ -214,6 +219,7 @@
 yield title, contents
 
 def findpage(self, text):
+"""Find page to work on."""
 pageR = re.compile(re.escape(self.pageStartMarker) + "(.*?)" +
re.escape(self.pageEndMarker), re.DOTALL)
 titleR = re.compile(re.escape(self.titleStartMarker) + "(.*?)" +
@@ -236,6 +242,7 @@
 
 
 def main():
+"""Main function."""
 # Adapt these to the file you are using. 'pageStartMarker' and
 # 'pageEndMarker' are the beginning and end of each entry. Take text that
 # should be included and does not occur elsewhere in the text.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2da03cac8e3939549fa6bd074539213ee594907
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 

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

[MediaWiki-commits] [Gerrit] Remove jstorage.js fork - change (mediawiki...Collection)

2014-10-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166643

Change subject: Remove jstorage.js fork
..

Remove jstorage.js fork

 * Use the one already available from core.

Change-Id: I0a985d20859529338b7bc83a5f40a949dfd00202
---
M Collection.php
D js/jstorage.js
2 files changed, 3 insertions(+), 215 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/43/166643/1

diff --git a/Collection.php b/Collection.php
index 6e4e63c..24229bf 100644
--- a/Collection.php
+++ b/Collection.php
@@ -212,8 +212,7 @@
 
 $wgResourceModules += array(
'ext.collection.jquery.jstorage' => $collResourceTemplate + array(
-   'scripts' => 'jstorage.js',
-   'dependencies' => 'json'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.suggest' => $collResourceTemplate + array(
'scripts' => 'suggest.js',
@@ -230,12 +229,12 @@
'ext.collection.bookcreator' => $collResourceTemplate + array(
'scripts' => 'bookcreator.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
),
'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + 
array(
'scripts' => 'check_load_from_localstorage.js',
'styles' => 'bookcreator.css',
-   'dependencies' => 'ext.collection.jquery.jstorage'
+   'dependencies' => 'jquery.jStorage'
)
 );
 
diff --git a/js/jstorage.js b/js/jstorage.js
deleted file mode 100644
index 1d152ad..000
--- a/js/jstorage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * - JSTORAGE -
- * Simple local storage wrapper to save data on the browser side, supporting
- * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
- *
- * Copyright (c) 2010 Andris Reinman, andris.rein...@gmail.com
- * Project homepage: www.jstorage.info
- *
- * Licensed under MIT-style license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
- * SOFTWARE.
- */
-
-/**
- * USAGE:
- *
- * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
- * the json2.js polyfill may also be needed.
- *
- * Methods:
- *
- * -set(key, value)
- * $.jStorage.set(key, value) -> saves a value
- *
- * -get(key[, default])
- * value = $.jStorage.get(key [, default]) ->
- * retrieves value if key exists, or default if it doesn't
- *
- * -deleteKey(key)
- * $.jStorage.deleteKey(key) -> removes a key from the storage
- *
- * -flush()
- * $.jStorage.flush() -> clears the cache
- *
- *  can be any JSON-able value, including objects and arrays.
- *
- */
-
-(function($){
-   if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
-   throw new Error("jQuery, MooTools or Prototype needs to be 
loaded before jStorage!");
-   }
-   $.jStorage = {
-
-   /* Version number */
-   version: "0.1.2",
-
-   /* This is the object, that holds the cached values */
-   _storage: {},
-
-   /* Actual browser storage (localStorage or 
globalStorage['domain']) */
-   _storage_service: {jStorage:"{}"},
-
-   /* DOM element for older IE versions, holds userData 
behavior */
-   _storage_elm: null,
-
-   /* function to encode objects to JSON strings */
-   json_encode: $.toJSON || Object.toJSON || (window.JSON 
&& JSON.stringify),
-
-   /* function to decode objects from JSON strings */
-   json_decode: $.evalJSON || (window.JSON && JSON.parse) 
|| function(str){
-   return String(str).evalJSON();
-   },
-
-   // PRIVATE METHODS

[MediaWiki-commits] [Gerrit] Make enhanced recent changes and extended watchlist default - change (mediawiki/core)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Make enhanced recent changes and extended watchlist default
..


Make enhanced recent changes and extended watchlist default

Wikimedia projects override submitted at I68ce04cd7 (6eea7e4c9).
This previously submitted as I7c2a27b4d (ffe3ca58582).

Bug: 35785
Change-Id: I0736f82ed8f74b7de64f2b1abdc6e5e12f2bf320
---
M RELEASE-NOTES-1.25
M includes/DefaultSettings.php
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Isarra: Looks good to me, but someone else must approve
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 862b132..647138e 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -18,6 +18,9 @@
   for 'languageScripts'.
 * Added a new hook, "ContentAlterParserOutput", to allow extensions to modify 
the
   parser output for a content object before links update.
+* (bug 35785) Enhanced recent changes and extended watchlist are now default.
+  Documentation: https://meta.wikimedia.org/wiki/Help:Enhanced_recent_changes
+  and https://www.mediawiki.org/wiki/Manual:$wgDefaultUserOptions.
 * (bug 67341) SVG images will no longer be base64-encoded when being embedded
   in CSS. This results in slight size increase before gzip compression (due to
   percent-encoding), but up to 20% decrease after it.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f2453e8..8a8d291 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4274,7 +4274,7 @@
'enotifrevealaddr' => 0,
'enotifusertalkpages' => 1,
'enotifwatchlistpages' => 1,
-   'extendwatchlist' => 0,
+   'extendwatchlist' => 1,
'fancysig' => 0,
'forceeditsummary' => 0,
'gender' => 'unknown',
@@ -4300,7 +4300,7 @@
'thumbsize' => 5,
'underline' => 2,
'uselivepreview' => 0,
-   'usenewrc' => 0,
+   'usenewrc' => 1,
'watchcreations' => 1,
'watchdefault' => 1,
'watchdeletion' => 0,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0736f82ed8f74b7de64f2b1abdc6e5e12f2bf320
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make list=novainstance available to anons - change (mediawiki...OpenStackManager)

2014-10-14 Thread jenkins-bot (Code Review)

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

Change subject: Make list=novainstance available to anons
..


Make list=novainstance available to anons

Right now, none of this information is available to you unless:

- You are logged in
- You are a member of the project

I talked to Andrew and Coren, and we're all ok with making this
info publicly available - nothing private here, and all of it
is exposed via SMW anyway.

Change-Id: Ia9ed925c1e75fce29baf9a1b81cf2a23b0eb6e0f
---
M api/ApiListNovaInstances.php
1 file changed, 10 insertions(+), 11 deletions(-)

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



diff --git a/api/ApiListNovaInstances.php b/api/ApiListNovaInstances.php
index be90e63..b369339 100644
--- a/api/ApiListNovaInstances.php
+++ b/api/ApiListNovaInstances.php
@@ -15,6 +15,9 @@
}
 
public function run() {
+   global $wgOpenStackManagerLDAPUsername;
+   global $wgOpenStackManagerLDAPUserPassword;
+
$params = $this->extractRequestParams();
$project = OpenStackNovaProject::getProjectByName( 
$params['project'] );
if ( !$project ) {
@@ -22,18 +25,14 @@
$this->dieUsage( 'Invalid project specified.', 
'badproject' );
}
 
-   if ( !$this->getUser()->isLoggedIn() ) {
-   $this->dieUsage( 'Must be logged in to use this API', 
'notloggedin' );
-   }
+   $user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername 
);
+   $userNova = OpenStackNovaController::newFromUser( $user );
+   $userNova->authenticate( $wgOpenStackManagerLDAPUsername, 
$wgOpenStackManagerLDAPUserPassword );
 
-   $user = new OpenStackNovaUser();
-   if ( !$user->exists() ) {
-   $this->dieUsage( 'NovaUser does not exist', 'baduser' );
-   }
-   $controller = OpenStackNovaController::newFromUser( $user );
-   $controller->setProject( $project->getName() );
-   $controller->setRegion( $params['region'] ); // validated by API
-   $instances = $controller->getInstances();
+   $userNova->setProject( $project->getName() );
+   $userNova->setRegion( $params['region'] ); // validated by API
+
+   $instances = $userNova->getInstances();
foreach ( $instances as $instance ) {
$info = array(
'name' => $instance->getInstanceName(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ed925c1e75fce29baf9a1b81cf2a23b0eb6e0f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 >

1 - 100 of 296 matches

Mail list logo