[MediaWiki-commits] [Gerrit] Use phpunit via composer instead of phpunit.phar - change (mediawiki...Wikibase)

2015-04-08 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Use phpunit via composer instead of phpunit.phar
..

Use phpunit via composer instead of phpunit.phar

This fixes hhvm tests on travis.

For some reason, the phpunit.phar has become a problem
when used with hhvm.

Bug: T95409
Change-Id: Ia101daa70d5f46dd12af9ca3e96d2b22d00799bf
---
M build/travis/install.sh
1 file changed, 3 insertions(+), 6 deletions(-)


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

diff --git a/build/travis/install.sh b/build/travis/install.sh
index fe630d6..b1a7250 100755
--- a/build/travis/install.sh
+++ b/build/travis/install.sh
@@ -14,15 +14,13 @@
 
 cd ..
 
-wget https://github.com/wikimedia/mediawiki/archive/$MW.tar.gz
+wget https://github.com/filbertkm/mediawiki/archive/$MW.tar.gz
 tar -zxf $MW.tar.gz
 mv mediawiki-$MW phase3
 
 cd phase3
-composer install --no-dev
-wget https://phar.phpunit.de/phpunit.phar
-chmod +x phpunit.phar
-mv phpunit.phar tests/phpunit/
+composer self-update
+composer install
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
@@ -38,5 +36,4 @@
 
 cd Wikibase
 
-composer self-update
 composer install --prefer-source

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia101daa70d5f46dd12af9ca3e96d2b22d00799bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] WIP more DonationQueue work - change (mediawiki...DonationInterface)

2015-04-08 Thread Awight (Code Review) 
Awight has uploaded a new change for review.

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

Change subject: WIP more DonationQueue work
..

WIP more DonationQueue work

* Discriminate between FIFO and key-value queue access, which allows us to stop
using antimessages.
* Scrap the STOMP hooks, and toggle on EnableStomp global exclusively.
* Start cleaning up the orphan slayer and refactoring to use DonationQueue.

Change-Id: Id40e497b35f5dd1e0cf148223c7b11b211ea27fc
---
M activemq_stomp/activemq_stomp.php
M gateway_common/DonationQueue.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M globalcollect_gateway/scripts/orphan_adapter.php
M globalcollect_gateway/scripts/orphans.php
6 files changed, 135 insertions(+), 283 deletions(-)


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

diff --git a/activemq_stomp/activemq_stomp.php 
b/activemq_stomp/activemq_stomp.php
index 4c0f2a9..11f71a1 100644
--- a/activemq_stomp/activemq_stomp.php
+++ b/activemq_stomp/activemq_stomp.php
@@ -50,46 +50,18 @@
  * nothing exploded big enough to kill the whole thing.
  */
 function sendSTOMP( $transaction, $queue ) {
+   // FIXME: Switching queueing style on this archaic, magic STOMP key 
name should be deprecated.
+   if ( array_key_exists( 'correlation-id', $transaction ) ) {
+   DonationLoggerFactory::getLogger()->info( 
/*{$logPrefix}*/"Queueing message at key [{$transaction['correlation-id']}], 
onto queue {$queue}" );
+   $queue->set( $properties['correlation-id'], $message, 
$properties );
+   } else {
+   DonationLoggerFactory::getLogger()->info( 
/*{$logPrefix}*/"Queueing message onto {$queue}" );
+   $queue->push( $message, $properties );
+   }
+
DonationQueue::sendMessage( $transaction, $queue );
 
return true;
-}
-
-/**
- * Hook to send transaction information to ActiveMQ server
- * @deprecated Use sendSTOMP with $queue = 'pending' instead
- *
- * @param array $transaction Key-value array of staged and ready donation data.
- * @return bool Just returns true all the time. Presumably an indication that
- * nothing exploded big enough to kill the whole thing.
- */
-function sendPendingSTOMP( $transaction ) {
-   return sendSTOMP( $transaction, 'pending' );
-}
-
-/**
- * Hook to send transaction information to ActiveMQ server
- * @deprecated Use sendSTOMP with $queue = 'limbo' instead
- *
- * @param array $transaction Key-value array of staged and ready donation data.
- * @return bool Just returns true all the time. Presumably an indication that
- * nothing exploded big enough to kill the whole thing.
- */
-function sendLimboSTOMP( $transaction ) {
-   return sendSTOMP( $transaction, 'limbo' );
-}
-
-/**
- * Hook to send transaction information to ActiveMQ server
- * @deprecated Use sendSTOMP with $queue = 'limbo' instead
- *
- * @param array $transaction Key-value array of staged and ready donation data.
- * @return bool Just returns true all the time. Presumably an indication that
- * nothing exploded big enough to kill the whole thing.
- */
-function sendFreeformSTOMP( $transaction, $queue ) {
-   $transaction['freeform'] = true;
-   return sendSTOMP( $transaction, $queue );
 }
 
 /**
diff --git a/gateway_common/DonationQueue.php b/gateway_common/DonationQueue.php
index c3d6f6a..8b80dfa 100644
--- a/gateway_common/DonationQueue.php
+++ b/gateway_common/DonationQueue.php
@@ -1,40 +1,50 @@
  
$rawQueue ) );
 
$properties = DonationQueue::buildHeaders( $transaction );
-   $message = DonationQueue::buildMessage( $transaction );
+   $message = DonationQueue::buildBody( $transaction );
 
// FIXME: We really do want the prefix to be applied 
transparently.
$logPrefix = "{$transaction['gateway']} 
{$transaction['contribution_tracking_id']}:";
if ( array_key_exists( 'gateway_txn_id', $transaction ) ) {
$logPrefix .= $transaction['gateway_txn_id'];
}
-
-   // FIXME: Switching insert style is a legacy thing.
-   if ( array_key_exists( 'correlation-id', $properties ) ) {
-   DonationLoggerFactory::getLogger()->info( "$logPrefix 
Queueing message at key [{$properties['correlation-id']}], onto queue 
{$rawQueue}" );
-   $queue->set( $properties['correlation-id'], $message, 
$properties );
-   } else {
-   DonationLoggerFactory::getLogger()->info( "$logPrefix 
Queueing message onto {$rawQueue}" );
-   $queue->push( $message, $properties );
-   }
}
 
/**
+* Build message headers from given donation data array
+*
+* @param array $transaction
 * @return array
 */
-   p

[MediaWiki-commits] [Gerrit] Add GlobalCssJs to shared extension job - change (integration/config)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add GlobalCssJs to shared extension job
..


Add GlobalCssJs to shared extension job

Passed in 
https://integration.wikimedia.org/ci/job/mediawiki-extensions-hhvm/11400/consoleFull

Change-Id: Iac1b3c76aa05a85a50cf1fbdad8431424c60b60b
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 512f009..c171f31 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -208,6 +208,7 @@
  mediawiki/extensions/EventLogging
  mediawiki/extensions/Flow
  mediawiki/extensions/Gather
+ mediawiki/extensions/GlobalCssJs
  mediawiki/extensions/JsonConfig
  mediawiki/extensions/Mantle
  mediawiki/extensions/MobileApp
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3600e58..7a92c31 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3568,6 +3568,7 @@
   - name: mediawiki/extensions/GlobalCssJs
 template:
   - name: lint-js
+  - name: extension-gate
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalPreferences

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac1b3c76aa05a85a50cf1fbdad8431424c60b60b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Add GlobalCssJs to shared extension job - change (integration/config)

2015-04-08 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Add GlobalCssJs to shared extension job
..

Add GlobalCssJs to shared extension job

Passed in 
https://integration.wikimedia.org/ci/job/mediawiki-extensions-hhvm/11400/consoleFull

Change-Id: Iac1b3c76aa05a85a50cf1fbdad8431424c60b60b
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/202998/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 512f009..c171f31 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -208,6 +208,7 @@
  mediawiki/extensions/EventLogging
  mediawiki/extensions/Flow
  mediawiki/extensions/Gather
+ mediawiki/extensions/GlobalCssJs
  mediawiki/extensions/JsonConfig
  mediawiki/extensions/Mantle
  mediawiki/extensions/MobileApp
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3600e58..7a92c31 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3568,6 +3568,7 @@
   - name: mediawiki/extensions/GlobalCssJs
 template:
   - name: lint-js
+  - name: extension-gate
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalPreferences

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac1b3c76aa05a85a50cf1fbdad8431424c60b60b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] Convert extensions to use generic phpunit job (F-G) - change (integration/config)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert extensions to use generic phpunit job (F-G)
..


Convert extensions to use generic phpunit job (F-G)

Change-Id: I0a99e6f582e41a68319e6681fed051e440db7612
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 46 insertions(+), 92 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index cc27505..582fa61 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -374,63 +374,17 @@
  - examples
  - ExtTab
  - FanBoxes
- - FeaturedFeeds
- - FeedsFromPrivateWikis
- - FilterListUsers
- - FirstSteps
  - FlaggedRevs:
 dependencies: 'Scribunto'
  - Flow:
 dependencies: 
'AbuseFilter,SpamBlacklist,CheckUser,Mantle,Echo,EventLogging,ConfirmEdit,VisualEditor'
- - FlvHandler
- - ForcePreview
- - FormatDates
- - FormatNum
- - FormelApplet
- - FormPreloadPostCache
- - Foxway
- - FundraiserLandingPage
- - FundraisingChart
- - FundraisingEmailUnsubscribe
- - FundraisingTranslateWorkflow
- - Gadgets
  - Gather:
 dependencies: 
'PageImages,TextExtracts,MobileFrontend,Echo,Mantle,VisualEditor'
- - Genderize
- - GeoCrumbs
- - GeoData
- - GeoGebra
  - GettingStarted:
 dependencies: 'CentralAuth,EventLogging,GuidedTour'
- - Git2Pages
  - GitHub
- - Gitweb
- - GlobalBlocking
- - GlobalContributions
- - GlobalCssJs
- - GlobalNotice
- - GlobalPreferences
- - GlobalUsage
- - GlobalUserGroups
- - GlobalUserPage
- - GlobalUserrights
- - GoogleAdSense
- - GoogleAPIClient
- - googleAnalytics
- - GoogleAnalyticsTopPages
- - GoogleAppEngine
- - GoogleCustomWikiSearch
- - GoogleDocs4MW
- - GoogleDocTag
- - GoogleLogin
- - GoogleMaps
- - GoogleNewsSitemap
- - GooglePlusOne
- - GoogleSiteSearch
  - Graph:
 dependencies: 'JsonConfig'
- - GraphViz
- - GroupsSidebar
  - GuidedTour:
 dependencies: 'EventLogging'
  - GWToolset:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 94c5703..3600e58 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3284,7 +3284,7 @@
   - name: mediawiki/extensions/FundraisingChart
 template:
   - name: extension-jslint
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/ContributionReporting
 template:
@@ -3457,7 +3457,7 @@
   - name: mediawiki/extensions/FeaturedFeeds
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FlaggedRevs
 template:
@@ -3493,22 +3493,22 @@
   - name: mediawiki/extensions/FormPreloadPostCache
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraiserLandingPage
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraisingTranslateWorkflow
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Gadgets
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Gather
 template:
@@ -3528,22 +3528,22 @@
   - name: mediawiki/extensions/GeoCrumbs
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GeoData
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GeoGebra
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Git2Pages
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GitHub
 template:
@@ -3553,77 +3553,77 @@
   - name: mediawiki/extensions/Gitweb
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalBlocking
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalContributions
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalCssJs
 template:
   - name: l

[MediaWiki-commits] [Gerrit] jenkins job validation, do not submit - change (mediawiki...GlobalCssJs)

2015-04-08 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: jenkins job validation, do not submit
..

jenkins job validation, do not submit

Change-Id: Ia7a887feb6e1b99eaba923994f334e0ad76443e9
---
A test.js
A test.json
A test.php
A test.py
A test.rb
5 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs 
refs/changes/97/202997/1

diff --git a/test.js b/test.js
new file mode 100644
index 000..6b2b3db
--- /dev/null
+++ b/test.js
@@ -0,0 +1 @@
+console.log("hello world");
diff --git a/test.json b/test.json
new file mode 100644
index 000..0967ef4
--- /dev/null
+++ b/test.json
@@ -0,0 +1 @@
+{}
diff --git a/test.php b/test.php
new file mode 100644
index 000..71625a4
--- /dev/null
+++ b/test.php
@@ -0,0 +1,2 @@
+https://gerrit.wikimedia.org/r/202997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7a887feb6e1b99eaba923994f334e0ad76443e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalCssJs
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] Bug fix serializing nested refs - change (mediawiki...parsoid)

2015-04-08 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bug fix serializing nested refs
..

Bug fix serializing nested refs

*  ids should be looked up in the edited DOM,
  not the original DOM.

Change-Id: I3745f30721993bf1d2389e8c6868fae1d1c91235
---
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests.js
3 files changed, 14 insertions(+), 11 deletions(-)


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

diff --git a/lib/mediawiki.SelectiveSerializer.js 
b/lib/mediawiki.SelectiveSerializer.js
index 9ed0477..e33814f 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -83,9 +83,7 @@
 
if ( !diff.isEmpty ) {
body = diff.dom;
-
-   // Add the serializer info
-   // new DiffToSelserConverter(this.env, body).convert();
+   this.env.page.editedDoc = body.ownerDocument;
 
if ( this.trace || ( this.env.conf.parsoid.dumpFlags &&
this.env.conf.parsoid.dumpFlags.indexOf( 
'dom:post-dom-diff' ) !== -1) ) {
diff --git a/lib/mediawiki.WikitextSerializer.js 
b/lib/mediawiki.WikitextSerializer.js
index 778ed8d..26f1820 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -528,8 +528,8 @@
 };
 
 WSP._buildExtensionWT = function(state, node, dataMW) {
-   var extName = dataMW.name,
-   srcParts = ["<", extName];
+   var extName = dataMW.name;
+   var srcParts = ["<", extName];
 
// Serialize extension attributes in normalized form as:
// key='value'
@@ -575,11 +575,11 @@
// If the body isn't contained in 
data-mw.body.html, look if
// there's an element pointed to by body.id.
var bodyElt = 
node.ownerDocument.getElementById(dataMW.body.id);
-   if (!bodyElt && state.env.page.dom) {
+   if (!bodyElt && state.env.page.editedDoc) {
// Try to get to it from the main page.
// This can happen when the  is 
inside another extension,
// most commonly inside a .
-   bodyElt = 
state.env.page.dom.ownerDocument.getElementById(dataMW.body.id);
+   bodyElt = 
state.env.page.editedDoc.getElementById(dataMW.body.id);
}
if (bodyElt) {
htmlText = bodyElt.innerHTML;
@@ -593,7 +593,7 @@
if (ref) {
extraDebug += ' [own 
doc: ' + ref.outerHTML + ']';
}
-   ref = 
state.env.page.dom.ownerDocument.querySelector(href);
+   ref = 
state.env.page.editedDoc.querySelector(href);
if (ref) {
extraDebug += ' [main 
doc: ' + ref.outerHTML + ']';
}
@@ -1367,8 +1367,8 @@
this.logType = selserMode ? "trace/selser" : "trace/wts";
this.trace = this.env.log.bind(this.env, this.logType);
 
-   if (!this.env.page.dom) {
-   this.env.page.dom = body;
+   if (!this.env.page.editedDoc) {
+   this.env.page.editedDoc = body.ownerDocument;
}
var state = new SerializerState(this, this.options);
try {
diff --git a/tests/parserTests.js b/tests/parserTests.js
index 400d068..ef05a0e 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -421,7 +421,12 @@
: new WikitextSerializer({ env: this.env });
 
try {
-   this.env.page.dom = item.cachedBODY;
+   if (startsAtWikitext) {
+   // FIXME: All tests share an env.
+   // => we need to initialize this each time over here.
+   this.env.page.dom = item.cachedBODY;
+   this.env.page.editedDoc = item.cachedBODY.ownerDoc;
+   }
if ( mode === 'selser' ) {
// console.warn("--> selsering: " + body.outerHTML);
this.env.setPageSrcInfo( item.wikitext );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3745f30721993bf

[MediaWiki-commits] [Gerrit] When parsoid fails, throw exception with status - change (mediawiki...ContentTranslation)

2015-04-08 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

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

Change subject: When parsoid fails, throw exception with status
..

When parsoid fails, throw exception with status

$req->getContent() does not have anything. So having that in
exception is useless

Change-Id: I2507840c32f853cf15100fe42f899675e2f149ed
---
M api/ApiContentTranslationPublish.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index ae481a4..c0158cd 100644
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -44,7 +44,7 @@
 
$status = $req->execute();
if ( !$status->isOK() ) {
-   throw new MWException( $req->getContent() );
+   throw new MWException( $status );
}
 
return $req->getContent();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2507840c32f853cf15100fe42f899675e2f149ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Fixed ApiQueryBase::selectNamedDb() return value - change (mediawiki/core)

2015-04-08 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Fixed ApiQueryBase::selectNamedDb() return value
..

Fixed ApiQueryBase::selectNamedDb() return value

The doc specifies that this func should return
named database connection, but it does not. Fixed.

Change-Id: Ibe62ff4275201382243c4861cc4fd15cf0316e43
---
M includes/api/ApiQueryBase.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/202994/1

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 1d4cff9..6c9d999 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -123,6 +123,7 @@
 */
public function selectNamedDB( $name, $db, $groups ) {
$this->mDb = $this->getQuery()->getNamedDB( $name, $db, $groups 
);
+   return $this->mDb;
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Log publishing errors to eventlogging for future analysis an... - change (mediawiki...ContentTranslation)

2015-04-08 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

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

Change subject: Log publishing errors to eventlogging for future analysis and 
fix
..

Log publishing errors to eventlogging for future analysis and fix

Uses Schema:ContentTranslationError
https://meta.wikimedia.org/wiki/Schema:ContentTranslationError

Change-Id: I0c6e8b99ac7e6e02a15bd1bdd57d2b321dcd49d2
---
M ContentTranslation.hooks.php
M modules/eventlogging/ext.cx.eventlogging.js
M modules/publish/ext.cx.publish.js
3 files changed, 16 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/93/202993/1

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 268239a..d2bb80d 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -112,6 +112,7 @@
public static function addEventLogging( array &$schemas ) {
$schemas['ContentTranslation'] = 11628043;
$schemas['ContentTranslationCTA'] = 11616099;
+   $schemas['ContentTranslationError'] = 11767097;
}
 
/**
diff --git a/modules/eventlogging/ext.cx.eventlogging.js 
b/modules/eventlogging/ext.cx.eventlogging.js
index c4c7e1b..09c7bf7 100644
--- a/modules/eventlogging/ext.cx.eventlogging.js
+++ b/modules/eventlogging/ext.cx.eventlogging.js
@@ -61,8 +61,9 @@
 * @param {string} targetLanguage Target language code
 * @param {string} sourceTitle Source title
 * @param {string} targetTitle Target title
+* @param {string} trace Error trace
 */
-   publishFailed: function ( sourceLanguage, targetLanguage, 
sourceTitle, targetTitle ) {
+   publishFailed: function ( sourceLanguage, targetLanguage, 
sourceTitle, targetTitle, trace ) {
mw.track( 'event.ContentTranslation', {
version: 1,
token: mw.user.id(),
@@ -73,6 +74,17 @@
sourceTitle: sourceTitle,
targetTitle: targetTitle
} );
+   mw.track( 'event.ContentTranslationError', {
+   version: 1,
+   token: mw.user.id(),
+   session: mw.user.sessionId(),
+   context: 'publish-failure',
+   sourceLanguage: sourceLanguage,
+   targetLanguage: targetLanguage,
+   sourceTitle: sourceTitle,
+   targetTitle: targetTitle,
+   trace: trace
+   } );
},
 
/**
diff --git a/modules/publish/ext.cx.publish.js 
b/modules/publish/ext.cx.publish.js
index 233ffa2..42e9508 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -283,7 +283,8 @@
mw.cx.sourceLanguage,
mw.cx.targetLanguage,
mw.cx.sourceTitle,
-   this.targetTitle
+   this.targetTitle,
+   JSON.stringify( details )
);
mw.hook( 'mw.cx.error' ).fire( mw.msg( 'cx-publish-page-error' 
) );
mw.log( '[CX] Error while publishing:', code, trace );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c6e8b99ac7e6e02a15bd1bdd57d2b321dcd49d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Convert extensions to use generic phpunit job (F-G) - change (integration/config)

2015-04-08 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Convert extensions to use generic phpunit job (F-G)
..

Convert extensions to use generic phpunit job (F-G)

Change-Id: I0a99e6f582e41a68319e6681fed051e440db7612
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 46 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/92/202992/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index cc27505..582fa61 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -374,63 +374,17 @@
  - examples
  - ExtTab
  - FanBoxes
- - FeaturedFeeds
- - FeedsFromPrivateWikis
- - FilterListUsers
- - FirstSteps
  - FlaggedRevs:
 dependencies: 'Scribunto'
  - Flow:
 dependencies: 
'AbuseFilter,SpamBlacklist,CheckUser,Mantle,Echo,EventLogging,ConfirmEdit,VisualEditor'
- - FlvHandler
- - ForcePreview
- - FormatDates
- - FormatNum
- - FormelApplet
- - FormPreloadPostCache
- - Foxway
- - FundraiserLandingPage
- - FundraisingChart
- - FundraisingEmailUnsubscribe
- - FundraisingTranslateWorkflow
- - Gadgets
  - Gather:
 dependencies: 
'PageImages,TextExtracts,MobileFrontend,Echo,Mantle,VisualEditor'
- - Genderize
- - GeoCrumbs
- - GeoData
- - GeoGebra
  - GettingStarted:
 dependencies: 'CentralAuth,EventLogging,GuidedTour'
- - Git2Pages
  - GitHub
- - Gitweb
- - GlobalBlocking
- - GlobalContributions
- - GlobalCssJs
- - GlobalNotice
- - GlobalPreferences
- - GlobalUsage
- - GlobalUserGroups
- - GlobalUserPage
- - GlobalUserrights
- - GoogleAdSense
- - GoogleAPIClient
- - googleAnalytics
- - GoogleAnalyticsTopPages
- - GoogleAppEngine
- - GoogleCustomWikiSearch
- - GoogleDocs4MW
- - GoogleDocTag
- - GoogleLogin
- - GoogleMaps
- - GoogleNewsSitemap
- - GooglePlusOne
- - GoogleSiteSearch
  - Graph:
 dependencies: 'JsonConfig'
- - GraphViz
- - GroupsSidebar
  - GuidedTour:
 dependencies: 'EventLogging'
  - GWToolset:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 94c5703..3600e58 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3284,7 +3284,7 @@
   - name: mediawiki/extensions/FundraisingChart
 template:
   - name: extension-jslint
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/ContributionReporting
 template:
@@ -3457,7 +3457,7 @@
   - name: mediawiki/extensions/FeaturedFeeds
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FlaggedRevs
 template:
@@ -3493,22 +3493,22 @@
   - name: mediawiki/extensions/FormPreloadPostCache
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraiserLandingPage
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraisingTranslateWorkflow
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Gadgets
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Gather
 template:
@@ -3528,22 +3528,22 @@
   - name: mediawiki/extensions/GeoCrumbs
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GeoData
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GeoGebra
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Git2Pages
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GitHub
 template:
@@ -3553,77 +3553,77 @@
   - name: mediawiki/extensions/Gitweb
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalBlocking
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/GlobalContributions
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions

[MediaWiki-commits] [Gerrit] Replace use of assertType with assertInternalType and assert... - change (mediawiki/core)

2015-04-08 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Replace use of assertType with assertInternalType and 
assertInstanceOf
..

Replace use of assertType with assertInternalType and assertInstanceOf

These are available in phpunit since 3.5.0, which I think
is reasonable to expect people to have at this point,
especially when we actually require 3.7.0 or higher in phpunit.php:

if ( $puVersion !== '@package_version@' && version_compare( $puVersion, 
'3.7.0', '<' ) ) {
die( "PHPUnit 3.7.0 or later required; you have {$puVersion}.\n" );
}

Change-Id: Ic32ab45110e4c4304ef046ae8d0e98c74129
---
M tests/phpunit/includes/api/query/ApiQueryTestBase.php
M tests/phpunit/includes/filebackend/FileBackendTest.php
M tests/phpunit/includes/json/FormatJsonTest.php
M tests/phpunit/includes/utils/UIDGeneratorTest.php
4 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/202991/1

diff --git a/tests/phpunit/includes/api/query/ApiQueryTestBase.php 
b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
index dabf72e..9e830f2 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
@@ -56,12 +56,12 @@
 * @return array
 */
private function validateRequestExpectedPair( $v ) {
-   $this->assertType( 'array', $v, self::PARAM_ASSERT );
+   $this->assertInternalType( 'array', $v, self::PARAM_ASSERT );
$this->assertEquals( 2, count( $v ), self::PARAM_ASSERT );
$this->assertArrayHasKey( 0, $v, self::PARAM_ASSERT );
$this->assertArrayHasKey( 1, $v, self::PARAM_ASSERT );
-   $this->assertType( 'array', $v[0], self::PARAM_ASSERT );
-   $this->assertType( 'array', $v[1], self::PARAM_ASSERT );
+   $this->assertInternalType( 'array', $v[0], self::PARAM_ASSERT );
+   $this->assertInternalType( 'array', $v[1], self::PARAM_ASSERT );
 
return $v;
}
diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php 
b/tests/phpunit/includes/filebackend/FileBackendTest.php
index bfca75a..aaa93ef 100644
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -2376,7 +2376,7 @@
 
$status = Status::newGood();
$sl = $this->backend->getScopedFileLocks( $paths, 
LockManager::LOCK_EX, $status );
-   $this->assertType( 'ScopedLock', $sl,
+   $this->assertInstanceOf( 'ScopedLock', $sl,
"Scoped locking of files succeeded ($backendName)." );
$this->assertEquals( array(), $status->errors,
"Scoped locking of files succeeded ($backendName)." );
diff --git a/tests/phpunit/includes/json/FormatJsonTest.php 
b/tests/phpunit/includes/json/FormatJsonTest.php
index f0ac6ac..8bca333 100644
--- a/tests/phpunit/includes/json/FormatJsonTest.php
+++ b/tests/phpunit/includes/json/FormatJsonTest.php
@@ -159,12 +159,12 @@
$this->assertJson( $json );
 
$st = FormatJson::parse( $json );
-   $this->assertType( 'Status', $st );
+   $this->assertInstanceOf( 'Status', $st );
$this->assertTrue( $st->isGood() );
$this->assertEquals( $expected, $st->getValue() );
 
$st = FormatJson::parse( $json, FormatJson::FORCE_ASSOC );
-   $this->assertType( 'Status', $st );
+   $this->assertInstanceOf( 'Status', $st );
$this->assertTrue( $st->isGood() );
$this->assertEquals( $value, $st->getValue() );
}
@@ -230,7 +230,7 @@
}
 
$st = FormatJson::parse( $value, FormatJson::TRY_FIXING );
-   $this->assertType( 'Status', $st );
+   $this->assertInstanceOf( 'Status', $st );
if ( $expected === false ) {
$this->assertFalse( $st->isOK(), 'Expected isOK() == 
false' );
} else {
@@ -256,7 +256,7 @@
 */
public function testParseErrors( $value ) {
$st = FormatJson::parse( $value );
-   $this->assertType( 'Status', $st );
+   $this->assertInstanceOf( 'Status', $st );
$this->assertFalse( $st->isOK() );
}
 
@@ -313,7 +313,7 @@
 */
public function testParseStripComments( $json, $expect ) {
$st = FormatJson::parse( $json, FormatJson::STRIP_COMMENTS );
-   $this->assertType( 'Status', $st );
+   $this->assertInstanceOf( 'Status', $st );
$this->assertTrue( $st->isGood() );
$this->assertEquals( $expect, $st->getValue() );
}
diff --git a/tests/phpu

[MediaWiki-commits] [Gerrit] Add phplint job for mediawiki/vendor - change (integration/config)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add phplint job for mediawiki/vendor
..


Add phplint job for mediawiki/vendor

Change-Id: I7355f9729d5d0c4fff4eb12edfd07ae3378866d8
---
M tests/test_zuul_layout.py
M zuul/layout.yaml
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index fed8a09..362441e 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -126,7 +126,7 @@
 ],
 'mediawiki/vendor$': [
 self.assertProjectHasComposerValidate,
-# self.assertProjectHasPhplint FIXME
+self.assertProjectHasPhplint
 ],
 }
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e0946cb..94c5703 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2056,13 +2056,16 @@
 template:
   - name: extension-gate
 check:
+  - phplint
   - php-composer-validate
 test:
+  - phplint
   - php-composer-validate
   - mediawiki-core-qunit
   - mediawiki-phpunit-hhvm
   - mediawiki-phpunit-zend
 gate-and-submit:
+  - phplint
   - mediawiki-phpunit-hhvm
   - mediawiki-phpunit-zend
   - mediawiki-core-qunit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7355f9729d5d0c4fff4eb12edfd07ae3378866d8
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Bump mediawiki-vagrant version in Gemfile.lock - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Bump mediawiki-vagrant version in Gemfile.lock
..

Bump mediawiki-vagrant version in Gemfile.lock

Change-Id: I59128c304ed7cc64bff6c126a3c8f55e095917e8
---
M Gemfile.lock
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/87/202987/1

diff --git a/Gemfile.lock b/Gemfile.lock
index a1e4db9..eee541c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@
 PATH
   remote: .
   specs:
-mediawiki-vagrant (0.5.0)
+mediawiki-vagrant (0.6.0)
 
 GEM
   remote: https://rubygems.org/

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

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

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

[MediaWiki-commits] [Gerrit] Fix puppet-lint warnings - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Fix puppet-lint warnings
..

Fix puppet-lint warnings

Fix almost all puppet-lint warnings. Most were about => indentation.
There is one left where puppet-lint doesn't like that we have a file
resource that is not in a module.

Change-Id: I7ebd04293d430fe5564a885728224009579509c8
---
M puppet/manifests/site.pp
M puppet/modules/apache/manifests/conf.pp
M puppet/modules/git/manifests/clone.pp
M puppet/modules/git/manifests/install.pp
M puppet/modules/kibana/manifests/dashboard.pp
M puppet/modules/kibana/manifests/init.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/jobrunner.pp
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mediawiki/manifests/skin.pp
M puppet/modules/memcached/manifests/init.pp
M puppet/modules/memcached/manifests/php.pp
M puppet/modules/phabricator/manifests/config.pp
M puppet/modules/phabricator/manifests/init.pp
M puppet/modules/role/manifests/accountinfo.pp
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/role/manifests/geodata_elastic.pp
M puppet/modules/role/manifests/globaluserpage.pp
M puppet/modules/role/manifests/imagemetrics.pp
M puppet/modules/role/manifests/labs_initial_content.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/role/manifests/simple_miser.pp
M puppet/modules/role/manifests/simple_performant.pp
M puppet/modules/role/manifests/urlshortener.pp
M puppet/modules/role/manifests/wikimetrics.pp
M puppet/modules/rsyslog/manifests/init.pp
M puppet/modules/sentry/manifests/init.pp
29 files changed, 147 insertions(+), 143 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/86/202986/1

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 87fb078..cb330f1 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -47,9 +47,9 @@
 }
 
 file { '/srv':
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
+owner => 'root',
+group => 'root',
+mode  => '0755',
 }
 
 package { 'python-pip': } -> Package <| provider == pip |>
diff --git a/puppet/modules/apache/manifests/conf.pp 
b/puppet/modules/apache/manifests/conf.pp
index 57370ea..27760d8 100644
--- a/puppet/modules/apache/manifests/conf.pp
+++ b/puppet/modules/apache/manifests/conf.pp
@@ -68,11 +68,11 @@
 }
 
 file { "/etc/apache2/${conf_type}-enabled/${conf_file}":
-ensure  => $link_ensure,
-target  => "/etc/apache2/${conf_type}-available/${conf_file}",
-notify  => Service['apache2'],
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
+ensure => $link_ensure,
+target => "/etc/apache2/${conf_type}-available/${conf_file}",
+notify => Service['apache2'],
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
 }
 }
diff --git a/puppet/modules/git/manifests/clone.pp 
b/puppet/modules/git/manifests/clone.pp
index 7c55b8d..95ee5de 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -79,13 +79,13 @@
 }
 
 exec { "git_clone_${title}":
-command => "git clone ${arg_recurse} ${arg_depth} ${arg_branch} 
${repository} ${directory}",
-cwd => '/',
-creates => "${directory}/.git",
-user=> $owner,
-group   => $group,
-require => Package['git'],
-timeout => 0,
+command => "git clone ${arg_recurse} ${arg_depth} ${arg_branch} 
${repository} ${directory}",
+cwd => '/',
+creates => "${directory}/.git",
+user=> $owner,
+group   => $group,
+require => Package['git'],
+timeout => 0,
 }
 
 if (!defined(File[$directory])) {
diff --git a/puppet/modules/git/manifests/install.pp 
b/puppet/modules/git/manifests/install.pp
index 96414d8..b70214e 100644
--- a/puppet/modules/git/manifests/install.pp
+++ b/puppet/modules/git/manifests/install.pp
@@ -62,12 +62,12 @@
 
 if $preserve_commit {
 exec { "git_install_reset_${title}":
-command   => 'git clean -d --force & git checkout -- .',
-cwd   => $directory,
-user  => $owner,
-unless=> "git diff HEAD..${commit} --exit-code",
-notify=> Exec["git_install_checkout_${title}"],
-require   => Git::Clone[$title],
+command => 'git clean -d --force & git checkout -- .',
+cwd => $directory,
+user=> $owner,
+unless  => "git diff HEAD..${commit} --exit-code",
+notify  => Exec["git_install_checkout_${title}"],
+require => Git::Clone[$title],
 }
 }
 }
diff --

[MediaWiki-commits] [Gerrit] Cleanup site.pp and use ::mwv - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Cleanup site.pp and use ::mwv
..

Cleanup site.pp and use ::mwv

Move non-basic configuration out of site.pp and into existing Puppet
classes. Also move some includes from ::role::mediawiki into ::mwv.

Change-Id: I08fe22e7474122ba7ab6a8aa971a3f62a452d8cc
---
M puppet/manifests/site.pp
M puppet/modules/misc/manifests/init.pp
M puppet/modules/mwv/manifests/init.pp
M puppet/modules/role/manifests/mediawiki.pp
4 files changed, 47 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/90/202990/1

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index ad6944e..80609de 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -46,47 +46,6 @@
 backup => false,
 }
 
-file { '/srv':
-owner => 'root',
-group => 'root',
-mode  => '0755',
-}
-
-package { 'python-pip': } -> Package <| provider == pip |>
-
-# Remove chef if it is installed in the base image
-# Bug: 67693
-package { [ 'chef', 'chef-zero' ]:
-  ensure => absent,
-}
-
-# Ensure the uid/gid used for shared files exists in the VM
-if $::share_group =~ /^\d+$/ {
-group { 'vagrant_share':
-ensure=> 'present',
-gid   => $::share_group,
-allowdupe => true,
-}
-}
-if $::share_owner =~ /^\d+$/ {
-user { 'vagrant_share':
-ensure=> 'present',
-uid   => $::share_owner,
-gid   => $::share_group,
-allowdupe => true,
-}
-}
-
-# Install common development tools
-package { [ 'build-essential', 'python-dev', 'ruby-dev' ]: }
-
-# Initialize PHPStorm environment
-file { '/vagrant/.idea':
-source  => '/vagrant/support/idea-dist',
-recurse => true,
-replace => false,
-}
-
 # Assign classes to nodes via hiera
 # See hiera.yaml and hieradata/*.yaml
 hiera_include('classes')
diff --git a/puppet/modules/misc/manifests/init.pp 
b/puppet/modules/misc/manifests/init.pp
index 4de0fcc..fc77404 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -41,4 +41,11 @@
 env::profile_script { 'xdebug':
 content => template('misc/xdebug.erb'),
 }
+
+# Initialize PHPStorm environment from common template
+file { '/vagrant/.idea':
+source  => '/vagrant/support/idea-dist',
+recurse => true,
+replace => false,
+}
 }
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 2a4f9a6..41d31ed 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -1,6 +1,6 @@
 # == Class: mwv
 #
-# General settings for mediawiki-vagrant deployments
+# General settings and configuration for mediawiki-vagrant deployments
 #
 # === Parameters
 #
@@ -18,5 +18,41 @@
 $services_dir,
 $vendor_dir,
 ) {
-# FIXME: do we have initialization that can/should be moved here?
+include ::apt
+include ::env
+include ::git
+
+file { $vendor_dir:
+owner => 'root',
+group => 'root',
+mode  => '0755',
+}
+
+# Ensure the uid/gid used for shared files exists in the VM
+if $::share_group =~ /^\d+$/ {
+group { 'vagrant_share':
+ensure=> 'present',
+gid   => $::share_group,
+allowdupe => true,
+} -> File <| |>
+}
+if $::share_owner =~ /^\d+$/ {
+user { 'vagrant_share':
+ensure=> 'present',
+uid   => $::share_owner,
+gid   => $::share_group,
+allowdupe => true,
+} -> File <| |>
+}
+
+package { 'python-pip': } -> Package <| provider == pip |>
+
+# Install common development tools
+package { [ 'build-essential', 'python-dev', 'ruby-dev' ]: }
+
+# Remove chef if it is installed in the base image
+# Bug: 67693
+package { [ 'chef', 'chef-zero' ]:
+  ensure => absent,
+}
 }
diff --git a/puppet/modules/role/manifests/mediawiki.pp 
b/puppet/modules/role/manifests/mediawiki.pp
index 4bcadc1..d56d56f 100644
--- a/puppet/modules/role/manifests/mediawiki.pp
+++ b/puppet/modules/role/manifests/mediawiki.pp
@@ -8,14 +8,12 @@
 class role::mediawiki(
 $hostname,
 ){
-require ::apt
 include ::arcanist
-require ::env
-require ::git
+include ::mediawiki
 require ::misc
+require ::mwv
 require ::mysql
 require ::redis
-include ::mediawiki
 
 require_package('php5-tidy')
 require_package('tidy')

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

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

[MediaWiki-commits] [Gerrit] Remove unused puppet/files and puppet/templates - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Remove unused puppet/files and puppet/templates
..

Remove unused puppet/files and puppet/templates

All the goodies are in modules now!

Change-Id: I5c13ab2d91af950bbf2aacd9e752720f51b549dd
---
M Vagrantfile
M lib/labs-vagrant.rb
D puppet/files/.gitignore
D puppet/files/apt/wikimedia-precise.list
D puppet/templates/.gitignore
5 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/89/202989/1

diff --git a/Vagrantfile b/Vagrantfile
index 9f83a51..c7851d2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -198,7 +198,6 @@
 '--templatedir', '/vagrant/puppet/templates',
 '--verbose',
 '--config_version', '/vagrant/puppet/extra/config-version',
-'--fileserverconfig', '/vagrant/puppet/extra/fileserver.conf',
 '--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit || 
'unknown'}.log",
 '--logdest', 'console',
 '--write-catalog-summary',
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 327f8bc..ba0bac2 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -74,7 +74,6 @@
 --modulepath #{puppet_path}/modules \
 --manifestdir #{puppet_path}/manifests \
 --templatedir #{puppet_path}/templates \
---fileserverconfig #{puppet_path}/extra/fileserver.conf \
 --config_version #{puppet_path}/extra/config-version \
 --hiera_config #{puppet_path}/hiera.yaml \
 --verbose \
diff --git a/puppet/files/.gitignore b/puppet/files/.gitignore
deleted file mode 100644
index d3c2f59..000
--- a/puppet/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# .gitignore
diff --git a/puppet/files/apt/wikimedia-precise.list 
b/puppet/files/apt/wikimedia-precise.list
deleted file mode 100644
index dd5fb0e..000
--- a/puppet/files/apt/wikimedia-precise.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include precise packages so that CDH can be installed in Trusty.
-# This file is managed by Puppet.
-#
-deb http://apt.wikimedia.org/wikimedia precise-wikimedia main universe
-deb-src http://apt.wikimedia.org/wikimedia precise-wikimedia main universe
diff --git a/puppet/templates/.gitignore b/puppet/templates/.gitignore
deleted file mode 100644
index e69de29..000
--- a/puppet/templates/.gitignore
+++ /dev/null

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

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

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

[MediaWiki-commits] [Gerrit] Fix puppet-lint configuration to exclude submodules - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Fix puppet-lint configuration to exclude submodules
..

Fix puppet-lint configuration to exclude submodules

Fix the code to find and exclude submodule paths from puppet-lint runs
to work with puppet-lint 1.1.0.
See https://github.com/rodjek/puppet-lint/issues/331

Change-Id: Ife56a7f6ff102a22e476c513beb2fe8a34f767cc
---
M Rakefile
1 file changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/85/202985/1

diff --git a/Rakefile b/Rakefile
index b6d13ea..792eb65 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,12 +4,14 @@
 #
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.send('disable_autoloader_layout')
-
-gitmodules = File.expand_path '../.gitmodules', __FILE__
-
-PuppetLint.configuration.ignore_paths = 
IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) { "#{$1}/**/*.pp" }
+# Work around bug in puppet-lint configuration
+# https://github.com/rodjek/puppet-lint/issues/331
+Rake::Task[:lint].clear
+PuppetLint::RakeTask.new :lint do |config|
+gitmodules = File.expand_path '../.gitmodules', __FILE__
+config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) 
{ "#{$1}/**/*.pp" }
+config.disable_checks = [ '80chars', 'class_parameter_defaults', 
'autoloader_layout' ]
+ config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
+end
 
 task :default => [:lint]

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

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

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

[MediaWiki-commits] [Gerrit] Move shared_cache apt configuration from site.pp to ::apt - change (mediawiki/vagrant)

2015-04-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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

Change subject: Move shared_cache apt configuration from site.pp to ::apt
..

Move shared_cache apt configuration from site.pp to ::apt

Change-Id: If498af60a76e10135ba9e52f577bee091f3fa5ce
---
M puppet/manifests/site.pp
R puppet/modules/apt/files/01no-recommended
M puppet/modules/apt/manifests/init.pp
3 files changed, 22 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/88/202988/1

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index cb330f1..ad6944e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -54,32 +54,6 @@
 
 package { 'python-pip': } -> Package <| provider == pip |>
 
-# Note: both apt config blocks below look like they could use
-# `Package <| provider = apt |>` much like we user `provider == pip` above.
-# Unfortunately, puppet doesn't seem to recognize packages using the system
-# default provider as matching an explicit provider.
-if $::shared_apt_cache {
-file { '/etc/apt/apt.conf.d/20shared-cache':
-content => "Dir::Cache::archives \"${::shared_apt_cache}\";\n",
-} -> Package <| |>
-
-# bug 67976: don't clean up legacy cache locations until apt has been
-# reconfigured with new location.
-file { ['/vagrant/apt-cache', '/vagrant/composer-cache']:
-ensure  => absent,
-recurse => true,
-purge   => true,
-force   => true,
-require => File['/etc/apt/apt.conf.d/20shared-cache'],
-}
-}
-file { '/etc/apt/apt.conf.d/01no-recommended':
-source => 'puppet:///files/apt/01no-recommended',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-} -> Package <| |>
-
 # Remove chef if it is installed in the base image
 # Bug: 67693
 package { [ 'chef', 'chef-zero' ]:
diff --git a/puppet/files/apt/01no-recommended 
b/puppet/modules/apt/files/01no-recommended
similarity index 100%
rename from puppet/files/apt/01no-recommended
rename to puppet/modules/apt/files/01no-recommended
diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index cc827d7..47b1511 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -32,5 +32,27 @@
 before  => Exec['update_package_index'],
 }
 
+if $::shared_apt_cache {
+file { '/etc/apt/apt.conf.d/20shared-cache':
+content => "Dir::Cache::archives \"${::shared_apt_cache}\";\n",
+}
+
+# bug 67976: don't clean up legacy cache locations until apt has been
+# reconfigured with new location.
+file { ['/vagrant/apt-cache', '/vagrant/composer-cache']:
+ensure  => absent,
+recurse => true,
+purge   => true,
+force   => true,
+require => File['/etc/apt/apt.conf.d/20shared-cache'],
+}
+}
+file { '/etc/apt/apt.conf.d/01no-recommended':
+source => 'puppet:///modules/apt/01no-recommended',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
+
 Class['Apt'] -> Package <| |>
 }

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

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

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

[MediaWiki-commits] [Gerrit] Make activation timings sent to EventLogging not lie - change (mediawiki...VisualEditor)

2015-04-08 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Make activation timings sent to EventLogging not lie
..

Make activation timings sent to EventLogging not lie

The activation timing was always a bit of a lie even pre-TargetLoader,
because the timer only started when the first RL request for VE
modules had loaded. But at least the process it covered was consistent,
which is no longer true with TargetLoader. Now that we start the
request for the HTML together with the RL request, the activation
time might include some, all or none of the HTML request depending
on how fast the RL request was.

This change makes the activation timings more useful by measuring
from the moment the user clicks "edit" to the moment the editor
is done loading, which is what actually matters.

* Moved start of activation timing to VPT init
** For mobile this falls back to when mw.Target#load is called;
   we'll have to fix that in MobileFrontend later
* Moved end of activation timing out of TargetEvents#onSurfaceReady
  into individual onSurfaceReady handlers
** This is necessary because VPT's onSurfaceReady does quite a lot,
   and we want to include the time that takes in our measurements

Change-Id: Ie44f0b839b39a2b3b22dcd86e20f0d1170cb6069
---
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/init/ve.init.mw.TargetEvents.js
5 files changed, 28 insertions(+), 8 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index 5d03a67..992c087 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -67,6 +67,7 @@
  */
 ve.init.mw.MobileViewTarget.prototype.onSurfaceReady = function () {
this.restoreEditSection();
+   this.events.trackActivationComplete();
 };
 
 /**
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 6c1f634..779ad56 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -150,6 +150,12 @@
.always( hideLoading );
}
 
+   function trackActivateStart( initData ) {
+   ve.track( 'trace.activate.enter' );
+   ve.track( 'mwedit.init', initData );
+   mw.libs.ve.activationStart = ve.now();
+   }
+
conf = mw.config.get( 'wgVisualEditorConfig' );
tabMessages = conf.tabMessages;
uri = new mw.Uri();
@@ -435,8 +441,7 @@
return;
}
 
-   ve.track( 'trace.activate.enter' );
-   ve.track( 'mwedit.init', { type: 'page', mechanism: 
'click' } );
+   trackActivateStart( { type: 'page', mechanism: 'click' 
} );
 
if ( history.pushState && uri.query.veaction !== 'edit' 
) {
// Replace the current state with one that is 
tagged as ours, to prevent the
@@ -460,8 +465,7 @@
return;
}
 
-   ve.track( 'trace.activate.enter' );
-   ve.track( 'mwedit.init', { type: 'section', mechanism: 
'click' } );
+   trackActivateStart( { type: 'section', mechanism: 
'click' } );
 
if ( history.pushState && uri.query.veaction !== 'edit' 
) {
// Replace the current state with one that is 
tagged as ours, to prevent the
@@ -551,8 +555,7 @@
if ( isViewPage && uri.query.veaction === 'edit' ) {
isSection = uri.query.vesection !== undefined;
 
-   ve.track( 'trace.activate.enter' );
-   ve.track( 'mwedit.init', { type: isSection ? 
'section' : 'page', mechanism: 'url' } );
+   trackActivateStart( { type: isSection ? 
'section' : 'page', mechanism: 'url' } );
activateTarget();
}
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 078d506..05ad2f7 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -535,6 +535,7 @@
this.maybeShowMetaDialog();
 
this.activatingDeferred.resolve()

[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Update jquery.uls from upstream
..


Update jquery.uls from upstream

Update to a24f000a6e41796ff0dae69f9d7d92119ac
Change:
  Fix the regions for some languages

Change-Id: I1ed21b1118646487c0febbb0ae6092f4fd4c25ee
---
M lib/jquery.uls/src/jquery.uls.data.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/jquery.uls/src/jquery.uls.data.js 
b/lib/jquery.uls/src/jquery.uls.data.js
index 323396e..8e94f6d 100644
--- a/lib/jquery.uls/src/jquery.uls.data.js
+++ b/lib/jquery.uls/src/jquery.uls.data.js
@@ -3,5 +3,5 @@
'use strict';
$.uls = $.uls || {};
//noinspection JSHint
-   $.uls.data = {"languages":{"aa":["Latn",["AF"],"Qafár 
af"],"ab":["Cyrl",["EU"],"Аҧсшәа"],"abs":["Latn",["AS"],"Bahasa 
Ambon"],"ace":["Latn",["AS","PA"],"Acèh"],"acf":["Latn",["AM"],"kwéyòl"],"ady":["Cyrl",["EU","ME"],"Адыгэбзэ"],"ady-cyrl":["ady"],"ady-latn":["Latn",["EU","ME"],"Adygabze"],"aeb":["Arab",["AF"],"تونسي"],"af":["Latn",["AF"],"Afrikaans"],"ahr":["Deva",["AS"],"अहिराणी"],"ak":["Latn",["AF"],"Akan"],"akz":["Latn",["AM"],"Albaamo
 
innaaɬiilka"],"aln":["Latn",["EU"],"Gegë"],"am":["Ethi",["AF"],"አማርኛ"],"an":["Latn",["EU"],"aragonés"],"ang":["Latn",["EU"],"Ænglisc"],"anp":["Deva",["AS"],"अङ्गिका"],"ar":["Arab",["ME"],"العربية"],"arc":["Syrc",["ME"],"ܐܪܡܝܐ"],"arn":["Latn",["AM"],"mapudungun"],"aro":["Latn",["AM"],"Araona"],"arq":["Arab",["AF"],"جازايرية"],"ary":["Latn",["ME"],"Maġribi"],"arz":["Arab",["ME"],"مصرى"],"as":["Beng",["AS"],"অসমীয়া"],"ase":["Sgnw",["AM"],"American
 sign 
language"],"ast":["Latn",["EU"],"asturianu"],"av":["Cyrl",["EU"],"авар"],"avk":["Latn",["WW"],"Kotava"],"ay":["Latn",["AM"],"Aymar
 
aru"],"az":["az-latn"],"az-latn":["Latn",["EU","ME"],"azərbaycanca"],"az-arab":["Arab",["EU","ME"],"آذربايجانجا"],"az-cyrl":["Latn",["EU","ME"],"азәрбајҹанҹа"],"azb":["az-arab"],"ba":["Cyrl",["EU"],"башҡортса"],"ban":["Bali",["AS"],"ᬩᬲᬩᬮᬶ"],"bar":["Latn",["EU"],"Boarisch"],"bat-smg":["sgs"],"bbc-latn":["Latn",["AS"],"Batak
 Toba"],"bbc-batk":["Batk",["AS"],"Batak Toba"],"bbc":["Latn",["AS"],"Batak 
Toba"],"bcc":["Arab",["AS","ME"],"بلوچی مکرانی"],"bcl":["Latn",["AS"],"Bikol 
Central"],"be-tarask":["Cyrl",["EU"],"беларуская 
(тарашкевіца)"],"be-x-old":["be-tarask"],"be":["Cyrl",["EU"],"беларуская"],"bew":["Latn",["AS"],"Bahasa
 
Betawi"],"bfa":["Latn",["AF"],"Bari"],"bfq":["Taml",["AS"],"படகா"],"bg":["Cyrl",["EU"],"български"],"bgn":["Arab",["EU"],"بلوچی
 
رخشانی"],"bh":["Deva",["AS"],"भोजपुरी"],"bho":["Deva",["AS"],"भोजपुरी"],"bi":["Latn",["PA"],"Bislama"],"bjn":["Latn",["AS"],"Bahasa
 
Banjar"],"bm":["Latn",["AF"],"bamanankan"],"bn":["Beng",["AS"],"বাংলা"],"bo":["Tibt",["AS"],"བོད་ཡིག"],"bpy":["Beng",["AS"],"বিষ্ণুপ্রিয়া
 
মণিপুরী"],"bqi":["Arab",["ME"],"بختياري"],"br":["Latn",["EU"],"brezhoneg"],"brh":["Latn",["ME","AS"],"Bráhuí"],"brx":["Deva",["AS"],"बड़ो"],"bs":["Latn",["EU"],"bosanski"],"bto":["Latn",["AS"],"Iriga
 Bicolano"],"bug":["Bugi",["AS"],"ᨅᨔ 
ᨕᨘᨁᨗ"],"bxr":["Cyrl",["AS"],"буряад"],"ca":["Latn",["EU"],"català"],"cbk-zam":["Latn",["AS"],"Chavacano
 de 
Zamboanga"],"cdo":["Latn",["AS"],"Mìng-dĕ̤ng-ngṳ̄"],"ce":["Cyrl",["EU"],"нохчийн"],"ceb":["Latn",["AS"],"Cebuano"],"ch":["Latn",["PA"],"Chamoru"],"cho":["Latn",["AM"],"Choctaw"],"chr":["Cher",["AM"],"ᏣᎳᎩ"],"chy":["Latn",["AM"],"Tsetsêhestâhese"],"ciw":["Latn",["AM"],"Ojibwemowin"],"ckb":["Arab",["ME"],"کوردی"],"cnh":["Latn",["AS"],"Lai
 
holh"],"co":["Latn",["EU"],"corsu"],"cps":["Latn",["AS"],"Capiceño"],"cr":["Cans",["AM"],"ᓀᐦᐃᔭᐍᐏᐣ"],"cr-cans":["cr"],"cr-latn":["Latn",["AM"],"Nēhiyawēwin"],"crh":["Latn",["EU"],"qırımtatarca"],"crh-cyrl":["Cyrl",["EU"],"къырымтатарджа"],"crh-latn":["crh"],"cs":["Latn",["EU"],"čeština"],"csb":["Latn",["EU"],"kaszëbsczi"],"cu":["Cyrl",["EU"],"словѣньскъ
 \/ 
ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ"],"cv":["Cyrl",["EU"],"Чӑвашла"],"cy":["Latn",["EU"],"Cymraeg"],"da":["Latn",["EU"],"dansk"],"de-at":["Latn",["EU"],"Österreichisches
 Deutsch"],"de-ch":["Latn",["EU"],"Schweizer 
Hochdeutsch"],"de-formal":["Latn",["EU"],"Deutsch 
(Sie-Form)"],"de":["Latn",["EU"],"Deutsch"],"din":["Latn",["AF"],"Thuɔŋjäŋ"],"diq":["Latn",["EU","AS"],"Zazaki"],"dsb":["Latn",["EU"],"dolnoserbski"],"dtp":["Latn",["AS"],"Dusun
 
Bundu-liwan"],"dty":["Deva",["AS"],"डोटेली"],"dv":["Thaa",["AS"],"ދިވެހިބަސް"],"dz":["Tibt",["AS"],"ཇོང་ཁ"],"ee":["Latn",["AF"],"eʋegbe"],"egl":["Latn",["EU"],"Emiliàn"],"el":["Grek",["EU"],"Ελληνικά"],"eml":["Latn",["EU"],"emiliàn
 e rumagnòl"],"en-ca":["Latn",["AM"],"Canadian 
English"],"en-gb":["Latn",["EU","AS","PA"],"British 
English"],"en":["Latn",["EU","AM","AF","ME","AS","PA","WW"],"English"],"eo":["Latn",["WW"],"Esperanto"],"es-419":["Latn",["AM"],"español
 de America Latina"],"es-formal":["Latn",["EU","AM","AF","WW"],"español 
(formal)"],"es":["Latn",["EU","AM","AF","WW"],"español"],"esu":["Lat

[MediaWiki-commits] [Gerrit] Initial commit - change (sink_nova_ldap)

2015-04-08 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged.

Change subject: Initial commit
..


Initial commit

Change-Id: Ibef88f1f46aaa191e88d0e59ab310e2266d9093b
---
A README
A nova_ldap/__init__.py
A nova_ldap/base.py
A nova_ldap/novaldap.py
A setup.py
5 files changed, 320 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Verified; Looks good to me, approved



diff --git a/README b/README
new file mode 100644
index 000..5f44f33
--- /dev/null
+++ b/README
@@ -0,0 +1,8 @@
+I'm using 'stdeb' to build debian packages here.  To build:
+
+$ sudo apt-get install python-stdeb
+$ python setup.py --command-packages=stdeb.command bdist_deb
+$ ls deb_dist/*.deb
+
+Note that due to file-system weirdness, stddeb errors out on labs
+boxes.  I'm running it on a VirtualBox VM without any trouble.
diff --git a/nova_ldap/__init__.py b/nova_ldap/__init__.py
new file mode 100644
index 000..711e39e
--- /dev/null
+++ b/nova_ldap/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import gettext
+import logging
diff --git a/nova_ldap/base.py b/nova_ldap/base.py
new file mode 100644
index 000..c00b144
--- /dev/null
+++ b/nova_ldap/base.py
@@ -0,0 +1,174 @@
+# Copyright 2015 Andrew Bogott for the Wikimedia Foundation
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import abc
+from oslo.config import cfg
+from designate import exceptions
+from designate.openstack.common import log as logging
+from designate.central import rpcapi as central_rpcapi
+from designate.context import DesignateContext
+from designate.notification_handler.base import BaseAddressHandler
+from designate.notification_handler.base import get_ip_data
+from designate.plugin import ExtensionPlugin
+
+import ldap
+import ldap.modlist
+
+LOG = logging.getLogger(__name__)
+central_api = central_rpcapi.CentralAPI()
+
+
+class BaseAddressLdapHandler(BaseAddressHandler):
+
+def _getLdapInfo(self, attr, conffile="/etc/ldap.conf"):
+try:
+f = open(conffile)
+except IOError:
+if conffile == "/etc/ldap.conf":
+# fallback to /etc/ldap/ldap.conf, which will likely
+# have less information
+f = open("/etc/ldap/ldap.conf")
+for line in f:
+if line.strip() == "":
+continue
+if line.split()[0].lower() == attr.lower():
+return line.split(None, 1)[1].strip()
+break
+
+def _initLdap(self):
+self.base = self._getLdapInfo("base")
+self.ldapHost = self._getLdapInfo("uri")
+self.sslType = self._getLdapInfo("ssl")
+
+self.binddn = cfg.CONF[self.name].get('ldapusername')
+self.bindpw = cfg.CONF[self.name].get('ldappassword')
+
+def _openLdap(self):
+self.ds = ldap.initialize(self.ldapHost)
+self.ds.protocol_version = ldap.VERSION3
+if self.sslType == "start_tls":
+self.ds.start_tls_s()
+
+try:
+self.ds.simple_bind_s(self.binddn, self.bindpw)
+return self.ds
+except ldap.CONSTRAINT_VIOLATION:
+LOG.debug("LDAP bind failure:  Too many failed attempts.\n")
+except ldap.INVALID_DN_SYNTAX:
+LOG.debug("LDAP bind failure:  The bind DN is incorrect... \n")
+except ldap.NO_SUCH_OBJECT:
+LOG.debug("LDAP bind failure:  Unable to locate the bind DN 
account.\n")
+except ldap.UNWILLING_TO_PERFORM, msg:
+LOG.debug("LDAP bind failure:  The LDAP server was unwilling to 
perform the action requested.\nError was: %s\n" % msg[0]["info"])
+except ldap.INVALID_CREDENTIALS:
+

[MediaWiki-commits] [Gerrit] Initial commit - change (sink_nova_ldap)

2015-04-08 Thread Andrew Bogott (Code Review) 
Andrew Bogott has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

Change-Id: Ibef88f1f46aaa191e88d0e59ab310e2266d9093b
---
A README
A nova_ldap/__init__.py
A nova_ldap/base.py
A nova_ldap/novaldap.py
A setup.py
5 files changed, 320 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sink_nova_ldap 
refs/changes/83/202983/1

diff --git a/README b/README
new file mode 100644
index 000..5f44f33
--- /dev/null
+++ b/README
@@ -0,0 +1,8 @@
+I'm using 'stdeb' to build debian packages here.  To build:
+
+$ sudo apt-get install python-stdeb
+$ python setup.py --command-packages=stdeb.command bdist_deb
+$ ls deb_dist/*.deb
+
+Note that due to file-system weirdness, stddeb errors out on labs
+boxes.  I'm running it on a VirtualBox VM without any trouble.
diff --git a/nova_ldap/__init__.py b/nova_ldap/__init__.py
new file mode 100644
index 000..711e39e
--- /dev/null
+++ b/nova_ldap/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import gettext
+import logging
diff --git a/nova_ldap/base.py b/nova_ldap/base.py
new file mode 100644
index 000..c00b144
--- /dev/null
+++ b/nova_ldap/base.py
@@ -0,0 +1,174 @@
+# Copyright 2015 Andrew Bogott for the Wikimedia Foundation
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+import abc
+from oslo.config import cfg
+from designate import exceptions
+from designate.openstack.common import log as logging
+from designate.central import rpcapi as central_rpcapi
+from designate.context import DesignateContext
+from designate.notification_handler.base import BaseAddressHandler
+from designate.notification_handler.base import get_ip_data
+from designate.plugin import ExtensionPlugin
+
+import ldap
+import ldap.modlist
+
+LOG = logging.getLogger(__name__)
+central_api = central_rpcapi.CentralAPI()
+
+
+class BaseAddressLdapHandler(BaseAddressHandler):
+
+def _getLdapInfo(self, attr, conffile="/etc/ldap.conf"):
+try:
+f = open(conffile)
+except IOError:
+if conffile == "/etc/ldap.conf":
+# fallback to /etc/ldap/ldap.conf, which will likely
+# have less information
+f = open("/etc/ldap/ldap.conf")
+for line in f:
+if line.strip() == "":
+continue
+if line.split()[0].lower() == attr.lower():
+return line.split(None, 1)[1].strip()
+break
+
+def _initLdap(self):
+self.base = self._getLdapInfo("base")
+self.ldapHost = self._getLdapInfo("uri")
+self.sslType = self._getLdapInfo("ssl")
+
+self.binddn = cfg.CONF[self.name].get('ldapusername')
+self.bindpw = cfg.CONF[self.name].get('ldappassword')
+
+def _openLdap(self):
+self.ds = ldap.initialize(self.ldapHost)
+self.ds.protocol_version = ldap.VERSION3
+if self.sslType == "start_tls":
+self.ds.start_tls_s()
+
+try:
+self.ds.simple_bind_s(self.binddn, self.bindpw)
+return self.ds
+except ldap.CONSTRAINT_VIOLATION:
+LOG.debug("LDAP bind failure:  Too many failed attempts.\n")
+except ldap.INVALID_DN_SYNTAX:
+LOG.debug("LDAP bind failure:  The bind DN is incorrect... \n")
+except ldap.NO_SUCH_OBJECT:
+LOG.debug("LDAP bind failure:  Unable to locate the bind DN 
account.\n")
+except ldap.UNWILLING_TO_PERFORM, msg:
+LOG.debug("LDAP bind failure:  The LDAP server was unwilling to 
perform the action requested.\nError was: %s\n" % msg[0]["info"])
+

[MediaWiki-commits] [Gerrit] tools: Make toollabs::services inherit from toollabs - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: tools: Make toollabs::services inherit from toollabs
..


tools: Make toollabs::services inherit from toollabs

Bug: T95210
Change-Id: I0d6055fcaf67ffc6121417ba1ecb837b42568329
---
M modules/toollabs/manifests/services.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
index 28a57fa..82596a1 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -1,6 +1,6 @@
 # = Class: toollabs::services
 # Provides various services based off tools manifests
-class toollabs::services {
+class toollabs::services inherits toollabs {
 
 include gridengine::submit_host
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d6055fcaf67ffc6121417ba1ecb837b42568329
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Make toollabs::services inherit from toollabs - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Make toollabs::services inherit from toollabs
..

tools: Make toollabs::services inherit from toollabs

Bug: T95210
Change-Id: I0d6055fcaf67ffc6121417ba1ecb837b42568329
---
M modules/toollabs/manifests/services.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/202982/1

diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
index 28a57fa..82596a1 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -1,6 +1,6 @@
 # = Class: toollabs::services
 # Provides various services based off tools manifests
-class toollabs::services {
+class toollabs::services inherits toollabs {
 
 include gridengine::submit_host
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d6055fcaf67ffc6121417ba1ecb837b42568329
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] dataset: lint - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: dataset: lint
..


dataset: lint

9 x time unaligned arrows

Bug:T93645
Change-Id: Idc2cef8420ea9839f1e5f77efcf98d176a111af5
---
M manifests/role/dataset.pp
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/manifests/role/dataset.pp b/manifests/role/dataset.pp
index e4d954d..1810bd0 100644
--- a/manifests/role/dataset.pp
+++ b/manifests/role/dataset.pp
@@ -19,9 +19,9 @@
 #
 class role::dataset::pagecounts_all_sites($enable = true) {
 class { '::dataset::cron::pagecounts_all_sites':
-source  =>  'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-all-sites',
-enable  => $enable,
-user=> 'datasets',
+source =>  'stat1002.eqiad.wmnet::hdfs-archive/pagecounts-all-sites',
+enable => $enable,
+user   => 'datasets',
 }
 }
 
@@ -35,9 +35,9 @@
 #
 class role::dataset::mediacounts($enable = true) {
 class { '::dataset::cron::mediacounts':
-source  =>  'stat1002.eqiad.wmnet::hdfs-archive/mediacounts',
-enable  => $enable,
-user=> 'datasets',
+source =>  'stat1002.eqiad.wmnet::hdfs-archive/mediacounts',
+enable => $enable,
+user   => 'datasets',
 }
 }
 
@@ -58,9 +58,9 @@
 'pagecounts' => true,
 }
 class { 'dataset':
-rsync=> $rsync,
-grabs=> $grabs,
-uploads  => $uploads,
+rsync   => $rsync,
+grabs   => $grabs,
+uploads => $uploads,
 }
 class { 'role::dataset::pagecountsraw': enable => true }
 
@@ -88,9 +88,9 @@
 #'kiwix' => true,
 }
 class { 'dataset':
-rsync=> $rsync,
-grabs=> $grabs,
-uploads  => $uploads,
+rsync   => $rsync,
+grabs   => $grabs,
+uploads => $uploads,
 }
 class { 'role::dataset::pagecountsraw': enable => false }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc2cef8420ea9839f1e5f77efcf98d176a111af5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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 paragraph unwrapping, moved to parent class - change (mediawiki...Math)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove paragraph unwrapping, moved to parent class
..


Remove paragraph unwrapping, moved to parent class

Depends on Ib04234f740 in VisualEditor.

Change-Id: I542f9e73f5fe3713a91ca5794d175936d873038d
---
M modules/VisualEditor/ve.ce.MWMathNode.js
1 file changed, 3 insertions(+), 10 deletions(-)

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



diff --git a/modules/VisualEditor/ve.ce.MWMathNode.js 
b/modules/VisualEditor/ve.ce.MWMathNode.js
index 91dee82..aa523a9 100644
--- a/modules/VisualEditor/ve.ce.MWMathNode.js
+++ b/modules/VisualEditor/ve.ce.MWMathNode.js
@@ -43,16 +43,9 @@
this.$element.addClass( 've-ce-mwMathNode' );
 };
 
-/** */
-ve.ce.MWMathNode.prototype.onParseSuccess = function ( deferred, response ) {
-   var data = response.visualeditor, contentNodes = this.$( data.content 
).get();
-   if ( contentNodes[0] && contentNodes[0].childNodes ) {
-   contentNodes = Array.prototype.slice.apply( 
contentNodes[0].childNodes );
-   }
-   deferred.resolve( contentNodes );
-};
-
-/** */
+/**
+ * @inheritdoc
+ */
 ve.ce.MWMathNode.prototype.afterRender = function () {
var $img,
node = this;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I542f9e73f5fe3713a91ca5794d175936d873038d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] gerrit: lint fixes in role class - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: gerrit: lint fixes in role class
..


gerrit: lint fixes in role class

20 x WARNING: indentation of => is not properly aligned
puppet-lint 1.1.0

Bug:T93645
Change-Id: I5c9487955fb2cfa4777dc5be6a6a42cdbbf148df
---
M manifests/role/gerrit.pp
1 file changed, 19 insertions(+), 19 deletions(-)

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



diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index c809126..6a93dab 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -48,18 +48,18 @@
 }
 
 ferm::service { 'gerrit_ssh':
-proto  => 'tcp',
-port   => '29418',
+proto => 'tcp',
+port  => '29418',
 }
 
 ferm::service { 'gerrit_http':
-proto  => 'tcp',
-port   => 'http',
+proto => 'tcp',
+port  => 'http',
 }
 
 ferm::service { 'gerrit_https':
-proto  => 'tcp',
-port   => 'https',
+proto => 'tcp',
+port  => 'https',
 }
 
 $replication_basic_push_refs = [
@@ -92,30 +92,30 @@
 'threads' => '4',
 'mirror'  => 'true',
 },
-'gitblit' => {
+'gitblit'=> {
 # Note: This is in single quotes on purpose. ${name} is not
 # expected to be expanded by puppet but rather by gerrit
 #
 # lint:ignore:single_quote_string_with_variables
-'url'   => 
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
+'url'   => 
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
 # lint:endignore
-'threads'   => '4',
-'authGroup' => 'mediawiki-replication',
-'push'  => '+refs/*:refs/*',
-'mirror'=> 'true',
+'threads'   => '4',
+'authGroup' => 'mediawiki-replication',
+'push'  => '+refs/*:refs/*',
+'mirror'=> 'true',
 },
-'github'  => {
+'github' => {
 # Note: This is in single quotes on purpose. ${name} is not
 # expected to be expanded by puppet but rather by gerrit
 #
 # lint:ignore:single_quote_string_with_variables
-'url'  => 
'g...@github.com:wikimedia/${name}',
+'url' => 'g...@github.com:wikimedia/${name}',
 # lint:endignore
-'threads'  => '4',
-'authGroup'=> 'mediawiki-replication',
-'push' => $replication_basic_push_refs,
-'remoteNameStyle'  => 'dash',
-'mirror'   => 'true',
+'threads' => '4',
+'authGroup'   => 'mediawiki-replication',
+'push'=> $replication_basic_push_refs,
+'remoteNameStyle' => 'dash',
+'mirror'  => 'true',
 },
 # Do not add custom mirrors for GitHub here!
 # Instead let the default replication happen and perform the 
rename

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c9487955fb2cfa4777dc5be6a6a42cdbbf148df
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] logging: lint - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: logging: lint
..


logging: lint

12 x WARNING: indentation of => is not properly aligned
puppet-lint 1.1.0

Change-Id: If91f1474145f7159643b69e57d808ee87de750a9
---
M manifests/role/logging.pp
1 file changed, 14 insertions(+), 12 deletions(-)

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



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index a809cee..b8e2891 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -61,11 +61,11 @@
 $logstash_port = 8324
 
 misc::udp2log::instance { 'mw':
-log_directory  =>$log_directory,
-monitor_log_age=>false,
-monitor_processes  =>false,
-monitor_packet_loss=>false,
-template_variables => {
+log_directory   =>$log_directory,
+monitor_log_age =>false,
+monitor_processes   =>false,
+monitor_packet_loss =>false,
+template_variables  => {
 error_processor_host => $error_processor_host,
 error_processor_port => 8423,
 
@@ -228,10 +228,12 @@
 }
 
 misc::udp2log::instance { 'oxygen':
-multicast   => true,
-packet_loss_log => '/var/log/udp2log/packet-loss.log',
-log_directory   => $webrequest_log_directory,
-template_variables => { 'webrequest_filter_directory' => 
$webrequest_filter_directory },
+multicast  => true,
+packet_loss_log=> '/var/log/udp2log/packet-loss.log',
+log_directory  => $webrequest_log_directory,
+template_variables => {
+'webrequest_filter_directory' => $webrequest_filter_directory
+},
 }
 }
 
@@ -282,9 +284,9 @@
 include misc::udp2log::utilities
 
 misc::udp2log::instance { 'misc':
-multicast  => true,
-packet_loss_log=> '/var/log/udp2log/packet-loss.log',
-monitor_log_age=> false,
+multicast   => true,
+packet_loss_log => '/var/log/udp2log/packet-loss.log',
+monitor_log_age => false,
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If91f1474145f7159643b69e57d808ee87de750a9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Make services host a submit host - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: tools: Make services host a submit host
..


tools: Make services host a submit host

Also put webservice file on such hosts

Bug: T95210
Change-Id: I827ce872a62dfe6d887acd90b2e91007ebc5dee0
---
M modules/toollabs/manifests/services.pp
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
index 6617815..28a57fa 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -1,6 +1,9 @@
 # = Class: toollabs::services
 # Provides various services based off tools manifests
 class toollabs::services {
+
+include gridengine::submit_host
+
 package { 'tools-manifest':
 ensure => latest,
 }
@@ -9,4 +12,13 @@
 ensure=> running,
 subscribe => Package['tools-manifest'],
 }
+
+file { '/usr/local/bin/webservice':
+ensure  => present,
+source  => 'puppet:///modules/toollabs/webservice2',
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+require => Package['python-yaml'], # Present on all hosts, defined for 
puppet diamond collector
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I827ce872a62dfe6d887acd90b2e91007ebc5dee0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Make services host a submit host - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Make services host a submit host
..

tools: Make services host a submit host

Also put webservice file on such hosts

Bug: T95210
Change-Id: I827ce872a62dfe6d887acd90b2e91007ebc5dee0
---
M modules/toollabs/manifests/services.pp
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/202981/1

diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
index 6617815..28a57fa 100644
--- a/modules/toollabs/manifests/services.pp
+++ b/modules/toollabs/manifests/services.pp
@@ -1,6 +1,9 @@
 # = Class: toollabs::services
 # Provides various services based off tools manifests
 class toollabs::services {
+
+include gridengine::submit_host
+
 package { 'tools-manifest':
 ensure => latest,
 }
@@ -9,4 +12,13 @@
 ensure=> running,
 subscribe => Package['tools-manifest'],
 }
+
+file { '/usr/local/bin/webservice':
+ensure  => present,
+source  => 'puppet:///modules/toollabs/webservice2',
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+require => Package['python-yaml'], # Present on all hosts, defined for 
puppet diamond collector
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I827ce872a62dfe6d887acd90b2e91007ebc5dee0
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] labsdns: lint fixes - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: labsdns: lint fixes
..


labsdns: lint fixes

WARNING: indentation of => is not properly aligned
puppet-lint 1.1.0

Bug:T93645
Change-Id: Ife77df84d823ee1e7db73b91c4ce7f0dd6f03160
---
M manifests/role/labsdns.pp
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index a03132c..12712ac 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -2,13 +2,13 @@
 include passwords::pdns
 
 class { '::labs_dns':
-dns_auth_ipaddress  => '208.80.154.12',
-dns_auth_query_address  => '208.80.154.12',
-dns_auth_soa_name   => 'labs-ns2.wikimedia.org',
-pdns_db_host=> 'm1-master.eqiad.wmnet',
-pdns_db_password=> $passwords::pdns::db_pass,
-pdns_recursor   => '208.80.154.239',
-recursor_ip_range   => '10.68.16.0/21',
+dns_auth_ipaddress => '208.80.154.12',
+dns_auth_query_address => '208.80.154.12',
+dns_auth_soa_name  => 'labs-ns2.wikimedia.org',
+pdns_db_host   => 'm1-master.eqiad.wmnet',
+pdns_db_password   => $passwords::pdns::db_pass,
+pdns_recursor  => '208.80.154.239',
+recursor_ip_range  => '10.68.16.0/21',
 }
 
 ferm::service { 'udp_dns_rec':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife77df84d823ee1e7db73b91c4ce7f0dd6f03160
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] logstash: lint - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: logstash: lint
..


logstash: lint

8 x WARNING: indentation of => is not properly aligned
puppet-lint 1.1.0

Change-Id: Iba65623fc9c2b1a606c0cb890ba92a895ce4fb28
---
M manifests/role/logstash.pp
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index e43c3c0..3f9bc15 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -109,11 +109,11 @@
 }
 
 class { '::logstash::output::elasticsearch':
-host=> '127.0.0.1',
-replication => 'async',
-require_tag => 'es',
-manage_indices  => true,
-priority=> 90,
+host   => '127.0.0.1',
+replication=> 'async',
+require_tag=> 'es',
+manage_indices => true,
+priority   => 90,
 }
 
 }
@@ -183,13 +183,13 @@
 
 # Add the index to ES
 file { '/etc/logstash/apifeatureusage-elasticsearch-template.json':
-ensure  => present,
-source  => 
'puppet:///files/logstash/apifeatureusage-elasticsearch-template.json',
+ensure => present,
+source => 
'puppet:///files/logstash/apifeatureusage-elasticsearch-template.json',
 }
 
 exec { 'Create apifeatureusage index template':
 command => template('logstash/create-apifeatureusage-index.erb'),
-unless => template('logstash/check-apifeatureusage-index.erb'),
+unless  => template('logstash/check-apifeatureusage-index.erb'),
 require => [
 Service['elasticsearch'],
 File['/etc/logstash/apifeatureusage-elasticsearch-template.json'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba65623fc9c2b1a606c0cb890ba92a895ce4fb28
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dumps: ferm service for rsyncd clients using hiera - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: dumps: ferm service for rsyncd clients using hiera
..

dumps: ferm service for rsyncd clients using hiera

Change-Id: I1315104b74371032bee0762c2fd4f88d5e709c5c
---
M manifests/role/dumps.pp
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/202980/1

diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index 12e9289..5745bc5 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -10,6 +10,16 @@
 check_command => 'check_http'
 }
 
+
+   $rsync_clients = hiera('dumps::rsync_clients')
+   $rsync_clients_ferm = join($rsync_clients, ' ')
+
+   ferm::service {'dumps-rsyncd':
+   port   => '873',
+   proto  => 'tcp',
+   srange => "@resolve(($rsync_clients_ferm))",
+   }
+
 }
 
 # ZIM dumps - https://en.wikipedia.org/wiki/ZIM_%28file_format%29

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1315104b74371032bee0762c2fd4f88d5e709c5c
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] WIP: LQT maintenance refactoring - change (mediawiki...Flow)

2015-04-08 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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

Change subject: WIP: LQT maintenance refactoring
..

WIP: LQT maintenance refactoring

Change-Id: Idb4c95d189c6de3df3a0c5103a619c7844296b20
---
M includes/Import/Converter.php
M includes/Import/LiquidThreadsApi/Objects.php
M maintenance/convertLqt.php
D maintenance/convertLqtPage.php
A maintenance/convertLqtPageFromRemoteApiForTesting.php
A maintenance/convertLqtPageOnLocalWiki.php
M maintenance/convertNamespaceFromWikitext.php
M tests/phpunit/Import/ConverterTest.php
8 files changed, 190 insertions(+), 141 deletions(-)


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

diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php
index b24bf2d..f689816 100644
--- a/includes/Import/Converter.php
+++ b/includes/Import/Converter.php
@@ -34,7 +34,7 @@
 * @var DatabaseBase Slave database of the current wiki. Required
 *  to lookup past page moves.
 */
-   protected $dbr;
+   protected $dbw;
 
/**
 * @var Importer Service capable of turning an IImportSource into
@@ -61,7 +61,7 @@
protected $strategy;
 
/**
-* @param DatabaseBase $dbr Slave wiki database to read from
+* @param DatabaseBase $dbw Master wiki database to read from
 * @param Importer $importer
 * @param LoggerInterface $logger
 * @param User $user Administrative user for moves and edits related
@@ -70,7 +70,7 @@
 * @throws ImportException When $user does not have an Id
 */
public function __construct(
-   DatabaseBase $dbr,
+   DatabaseBase $dbw,
Importer $importer,
LoggerInterface $logger,
User $user,
@@ -79,7 +79,7 @@
if ( !$user->getId() ) {
throw new ImportException( 'User must have id' );
}
-   $this->dbr = $dbr;
+   $this->dbw = $dbw;
$this->importer = $importer;
$this->logger = $logger;
$this->user = $user;
@@ -186,7 +186,7 @@
 * @return Title|null
 */
protected function getPageMovedFrom( Title $title ) {
-   $row = $this->dbr->selectRow(
+   $row = $this->dbw->selectRow(
array( 'logging', 'page' ),
array( 'log_namespace', 'log_title', 'log_user' ),
array(
diff --git a/includes/Import/LiquidThreadsApi/Objects.php 
b/includes/Import/LiquidThreadsApi/Objects.php
index 7bd7dc9..9517bd4 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -317,7 +317,7 @@
 class MovedImportPost extends ImportPost {
public function getRevisions() {
$factory = function( $data, $parent ) {
-   return new MovedImportRevision( $data, $parent );
+   return new MovedImportRevision( $data, $parent, 
$this->importSource->getScriptUser() );
};
$pageData = $this->importSource->getPageData( $this->pageId );
return new RevisionIterator( $pageData, $this, $factory );
diff --git a/maintenance/convertLqt.php b/maintenance/convertLqt.php
index a4b7521..cef22d1 100644
--- a/maintenance/convertLqt.php
+++ b/maintenance/convertLqt.php
@@ -22,38 +22,34 @@
parent::__construct();
$this->mDescription = "Converts LiquidThreads data to Flow 
data";
$this->addOption( 'logfile', 'File to read and store 
associations between imported items and their sources. This is required for the 
import to be idempotent.', true, true );
-   $this->addOption( 'verbose', 'Report on import progress to 
stdout' );
$this->addOption( 'debug', 'Include debug information with 
progress report' );
$this->addOption( 'startId', 'Page id to start importing at 
(inclusive)' );
$this->addOption( 'stopId', 'Page id to stop importing at 
(exclusive)' );
}
 
public function execute() {
-   if ( $this->getOption( 'verbose' ) ) {
-   $logger = new MaintenanceDebugLogger( $this );
-   if ( $this->getOption( 'debug' ) ) {
-   $logger->setMaximumLevel( LogLevel::DEBUG );
-   } else {
-   $logger->setMaximumLevel( LogLevel::INFO );
-   }
+   $logger = new MaintenanceDebugLogger( $this );
+   if ( $this->getOption( 'debug' ) ) {
+   $logger->setMaximumLevel( LogLevel::DEBUG );
} else {
-   $logger = new NullLogger;
+   $logger->setMaximum

[MediaWiki-commits] [Gerrit] tools: Add role / class for tools manifest services - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: tools: Add role / class for tools manifest services
..


tools: Add role / class for tools manifest services

Bug: T95210
Change-Id: Id56b57cce1247b529d3d903a3ae937a6f568c600
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/services.pp
2 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 122cf24..247bc35 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -33,6 +33,14 @@
 }
 }
 
+class services inherits role::labs::tools::common {
+system::role { 'role::labs::tools::services':
+description => 'Tool Labs manifest based services',
+}
+
+include toollabs::services
+}
+
 class submit inherits role::labs::tools::common {
 include toollabs::submit
 
diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
new file mode 100644
index 000..6617815
--- /dev/null
+++ b/modules/toollabs/manifests/services.pp
@@ -0,0 +1,12 @@
+# = Class: toollabs::services
+# Provides various services based off tools manifests
+class toollabs::services {
+package { 'tools-manifest':
+ensure => latest,
+}
+
+service { 'webservicemonitor':
+ensure=> running,
+subscribe => Package['tools-manifest'],
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] tools: Add role / class for tools manifest services - change (operations/puppet)

2015-04-08 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Add role / class for tools manifest services
..

tools: Add role / class for tools manifest services

Bug: T95210
Change-Id: Id56b57cce1247b529d3d903a3ae937a6f568c600
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/services.pp
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/202978/1

diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 122cf24..247bc35 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -33,6 +33,14 @@
 }
 }
 
+class services inherits role::labs::tools::common {
+system::role { 'role::labs::tools::services':
+description => 'Tool Labs manifest based services',
+}
+
+include toollabs::services
+}
+
 class submit inherits role::labs::tools::common {
 include toollabs::submit
 
diff --git a/modules/toollabs/manifests/services.pp 
b/modules/toollabs/manifests/services.pp
new file mode 100644
index 000..6617815
--- /dev/null
+++ b/modules/toollabs/manifests/services.pp
@@ -0,0 +1,12 @@
+# = Class: toollabs::services
+# Provides various services based off tools manifests
+class toollabs::services {
+package { 'tools-manifest':
+ensure => latest,
+}
+
+service { 'webservicemonitor':
+ensure=> running,
+subscribe => Package['tools-manifest'],
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id56b57cce1247b529d3d903a3ae937a6f568c600
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] core: getTitle: Return undefined for JavaScript links - change (mediawiki...Popups)

2015-04-08 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review.

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

Change subject: core: getTitle: Return undefined for JavaScript links
..

core: getTitle: Return undefined for JavaScript links

mw.Uri throws an exception when dealing with -

href="javascript:void(0);"

Using a try…catch to return undefined in this case.

Bug: T95215
Change-Id: I632e9dc0e70a5fddf9f2573572bfc8e7f6232923
---
M resources/ext.popups.core.js
M tests/qunit/ext.popups.core.test.js
2 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/76/202976/1

diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index 512f50d..fe9ea42 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -155,8 +155,15 @@
 * @return {string|undefined}
 */
mw.popups.getTitle = function ( href ) {
-   var title, titleRegex, matches,
+   var title, titleRegex, matches, linkHref;
+
+   // mw.Uri will throw an error for javascript links
+   // where href is javascript:void(0);
+   try {
linkHref = new mw.Uri( href );
+   } catch ( e ) {
+   return undefined;
+   }
 
// External links
if ( linkHref.host !== location.hostname ) {
diff --git a/tests/qunit/ext.popups.core.test.js 
b/tests/qunit/ext.popups.core.test.js
index 301cab8..833c605 100644
--- a/tests/qunit/ext.popups.core.test.js
+++ b/tests/qunit/ext.popups.core.test.js
@@ -9,7 +9,7 @@
QUnit.test( 'getTitle', function ( assert ) {
var cases, i, expected, actual;
 
-   QUnit.expect( 10 );
+   QUnit.expect( 11 );
cases = [
[ '/wiki/Foo', 'Foo' ],
[ '/wiki/Foo#Bar', 'Foo' ],
@@ -20,7 +20,8 @@
[ '/w/Foo?title=Foo&action=edit', undefined ],
[ '/w/index.php?title=%E6%B8%AC%E8%A9%A6', '測試' ],
[ '/w/index.php?oldid=1', undefined ],
-   [ '/Foo', undefined ]
+   [ '/Foo', undefined ],
+   [ 'javascript:void(0);', undefined ]
];
 
for ( i = 0; i < cases.length; i++ ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I632e9dc0e70a5fddf9f2573572bfc8e7f6232923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] Do not pass nulls to Title::newFromText - change (mediawiki...Translate)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Do not pass nulls to Title::newFromText
..


Do not pass nulls to Title::newFromText

$par defaults to null. Simplest is to convert it to (empty) string
and let Title::newFromText return null.

Change-Id: I85a8ef58daf1fbfa5ced298213f6b7f9ab304e94
---
M specials/SpecialTranslations.php
M tag/SpecialPageTranslationDeletePage.php
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/specials/SpecialTranslations.php b/specials/SpecialTranslations.php
index 973ead9..203391e 100644
--- a/specials/SpecialTranslations.php
+++ b/specials/SpecialTranslations.php
@@ -36,6 +36,8 @@
 
$out = $this->getOutput();
 
+   $par = (string)$par;
+
if ( $this->including() ) {
$title = Title::newFromText( $par );
if ( !$title ) {
diff --git a/tag/SpecialPageTranslationDeletePage.php 
b/tag/SpecialPageTranslationDeletePage.php
index 87dbefd..943a449 100644
--- a/tag/SpecialPageTranslationDeletePage.php
+++ b/tag/SpecialPageTranslationDeletePage.php
@@ -55,6 +55,8 @@
public function execute( $par ) {
$request = $this->getRequest();
 
+   $par = (string)$par;
+
// Yes, the use of getVal() and getText() is wanted, see bug 
T22365
$this->text = $request->getVal( 'wpTitle', $par );
$this->title = Title::newFromText( $this->text );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85a8ef58daf1fbfa5ced298213f6b7f9ab304e94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
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] ipsec-global: fix bug in non-verbose mode, exit if not root - change (operations/puppet)

2015-04-08 Thread Gage (Code Review) 
Gage has uploaded a new change for review.

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

Change subject: ipsec-global: fix bug in non-verbose mode, exit if not root
..

ipsec-global: fix bug in non-verbose mode, exit if not root

1. Fix whitespace
2. Exit if script is invoked without root privileges
3. In order to provide concise output for execution via Salt, normal output
from the ipsec command is redirected to /dev/null unless the -v flag is
supplied. This patch fixes the following bug (shown via set +x) in
which the stdout redirect is parsed as part of the connection name due to
quotes inserted by expansion of "$@":

$ sudo ipsec-global -b up
+ ipsec stroke up 'curium.eqiad.wmnet-cp3002.esams.wmnet_by_ipv6 >/dev/null'
no config named 'curium.eqiad.wmnet-berkelium.eqiad.wmnet_by_ipv4 >/dev/null'

The fix uses eval, because other syntax I tried all failed. I welcome alternate
solutions. Eval is noted for being a security risk in some situations, but I've
tried to exploit it in this case and I believe it is safe. Exploitation would
require modifying ipsec.conf to supply an invalid connection name such as
"foo;/badscript" as well as modifying this script to remove "set -e". As
modifying either file already requires root, the presence of eval in this
context does not appear to represent a security vulnerability.

If reviewers find this use of eval unacceptable and an alternative fix for the
bug described above isn't found, I'll rewrite this script in perl.

Change-Id: I3e20d4f4069ba5a9097993516d2252d1393cb919
---
M modules/strongswan/files/ipsec-global
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/202975/1

diff --git a/modules/strongswan/files/ipsec-global 
b/modules/strongswan/files/ipsec-global
index 9e31144..d1437e2 100644
--- a/modules/strongswan/files/ipsec-global
+++ b/modules/strongswan/files/ipsec-global
@@ -21,10 +21,10 @@
 }
 
 silent() {
-  if [[ $VERBOSE ]] ; then
-"$@"
-  else
-"$@ >/dev/null"
+if [[ $VERBOSE ]] ; then
+"$*"
+else
+eval "$* >/dev/null"
   fi
 }
 
@@ -67,6 +67,11 @@
 exit
 fi
 
+if [ "$EUID" -ne 0 ]
+then echo "ERROR: command must be run as root"
+exit
+fi
+
 case "$1" in
 up) if [ $CMD_UP = "up-nb" ] ; then
 for c in $CONNLIST ; do silent ipsec stroke $CMD_UP $c & done

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

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

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

[MediaWiki-commits] [Gerrit] resync cache node list hieradata - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: resync cache node list hieradata
..

resync cache node list hieradata

Change-Id: Iff83dd48b78dab71c5409fbdf5b2c025ef911c90
---
M hieradata/role/common/cache/mobile.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
3 files changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/202974/1

diff --git a/hieradata/role/common/cache/mobile.yaml 
b/hieradata/role/common/cache/mobile.yaml
index e721181..e8197a7 100644
--- a/hieradata/role/common/cache/mobile.yaml
+++ b/hieradata/role/common/cache/mobile.yaml
@@ -7,10 +7,10 @@
   - 'cp1059.eqiad.wmnet'
   - 'cp1060.eqiad.wmnet'
 hosts_esams:
-  # - 'cp3011.esams.wmnet' # T92306
-  - 'cp3012.esams.wmnet'
-  - 'cp3013.esams.wmnet'
-  - 'cp3014.esams.wmnet'
+  - 'cp3015.esams.wmnet'
+  - 'cp3016.esams.wmnet'
+  - 'cp3017.esams.wmnet'
+  - 'cp3018.esams.wmnet'
 hosts_ulsfo:
   - 'cp4011.ulsfo.wmnet'
   - 'cp4012.ulsfo.wmnet'
diff --git a/hieradata/role/common/cache/text.yaml 
b/hieradata/role/common/cache/text.yaml
index d8aaf99..5e6127a 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -11,6 +11,10 @@
   - 'cp1067.eqiad.wmnet'
   - 'cp1068.eqiad.wmnet'
 hosts_esams:
+  # - 'cp3011.esams.wmnet' # T92306
+  - 'cp3012.esams.wmnet'
+  - 'cp3013.esams.wmnet'
+  - 'cp3014.esams.wmnet'
   - 'cp3030.esams.wmnet'
   - 'cp3031.esams.wmnet'
   - 'cp3040.esams.wmnet'
diff --git a/hieradata/role/common/cache/upload.yaml 
b/hieradata/role/common/cache/upload.yaml
index 16492d3..e570555 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -23,14 +23,14 @@
   - 'cp3008.esams.wmnet'
   - 'cp3009.esams.wmnet'
   - 'cp3010.esams.wmnet'
-  - 'cp3015.esams.wmnet'
-  - 'cp3016.esams.wmnet'
-  - 'cp3017.esams.wmnet'
-  - 'cp3018.esams.wmnet'
   - 'cp3032.esams.wmnet'
   - 'cp3033.esams.wmnet'
+  - 'cp3034.esams.wmnet'
+  - 'cp3035.esams.wmnet'
   - 'cp3042.esams.wmnet'
   - 'cp3043.esams.wmnet'
+  - 'cp3044.esams.wmnet'
+  - 'cp3045.esams.wmnet'
 hosts_ulsfo:
   - 'cp4005.ulsfo.wmnet'
   - 'cp4006.ulsfo.wmnet'

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

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

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

[MediaWiki-commits] [Gerrit] T86663 4.4: repool cp301[48] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.4: repool cp301[48]
..


T86663 4.4: repool cp301[48]

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

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ae6d047..c704bf7 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -73,7 +73,7 @@
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
-# 'cp3014.esams.wmnet',
+'cp3014.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -177,7 +177,7 @@
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
-# 'cp3018.esams.wmnet',
+'cp3018.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1d455c3e5a44ab3637a618e73e672159de3a971
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.4: repool cp301[48] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.4: repool cp301[48]
..

T86663 4.4: repool cp301[48]

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/202973/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ae6d047..c704bf7 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -73,7 +73,7 @@
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
-# 'cp3014.esams.wmnet',
+'cp3014.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -177,7 +177,7 @@
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
-# 'cp3018.esams.wmnet',
+'cp3018.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] Get rid of $requiresWikitext - change (mediawiki...Flow)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Get rid of $requiresWikitext
..


Get rid of $requiresWikitext

It's pretty simple actually: API should always explicitly request a
specific format (which should already be the case)
If not specified, we're in noJS, in which case we should default to
html (output) or wikitext (edit)

Instead of defining some actions in requiresWikitext, I'd rather be
very specific & always set the content format; we weren't being very
consistent anyway (didn't setContentFormat everywhere, I think, so
some may default to storage format)

AFAICT, RevisionDiffViewFormatter didn’t need wikitext to be set but
Header.php expicitly included it in $requiresWikitext (probably because it
operated on wikitext). undo-edit-header is nearly identical, but wasn’t
included there.

Change-Id: Ib8e3ca23708d659bc7aeb3c664d32cc93004c6da
---
M includes/Api/ApiFlowBaseGet.php
M includes/Api/ApiFlowBasePost.php
M includes/Block/Block.php
M includes/Block/Header.php
M includes/Block/Topic.php
M includes/Block/TopicSummary.php
M tests/phpunit/api/ApiFlowEditHeaderTest.php
M tests/phpunit/api/ApiFlowEditPostTest.php
M tests/phpunit/api/ApiFlowEditTopicSummary.php
M tests/phpunit/api/ApiFlowReplyTest.php
M tests/phpunit/api/ApiFlowViewHeaderTest.php
11 files changed, 128 insertions(+), 143 deletions(-)

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



diff --git a/includes/Api/ApiFlowBaseGet.php b/includes/Api/ApiFlowBaseGet.php
index 8b7651d..839501d 100644
--- a/includes/Api/ApiFlowBaseGet.php
+++ b/includes/Api/ApiFlowBaseGet.php
@@ -30,6 +30,15 @@
$blockParams = 
$passedParams[$block->getName()];
}
 
+   // @deprecated
+   // BC override: to be removed once 
ApiFlowViewHeader.php, ApiFlowViewPost &
+   // ApiFlowViewTopicSummary.php no longer accept 
'contentFormat' param
+   if ( isset( $blockParams['format'] ) ) {
+   // override default 'format' value by 
old 'contentFormat',
+   // if it was specified
+   $blockParams['format'] = isset( 
$blockParams['contentFormat'] ) ? $blockParams['contentFormat'] : 
$blockParams['format'];
+   }
+
$output[$action]['result'][$block->getName()] = 
$block->renderApi( $blockParams );
}
}
diff --git a/includes/Api/ApiFlowBasePost.php b/includes/Api/ApiFlowBasePost.php
index 6b4adb1..422af74 100644
--- a/includes/Api/ApiFlowBasePost.php
+++ b/includes/Api/ApiFlowBasePost.php
@@ -59,9 +59,6 @@
$output[$action]['result'] = array();
foreach( $blocksToCommit as $block ) {
// Always return parsed text to client after 
successful submission?
-   // @Todo - hacky, maybe have format in the 
request to overwrite
-   // requiredWikitext
-   $block->unsetRequiresWikitext( $action );
$output[$action]['result'][$block->getName()] = 
$block->renderApi( $params[$block->getName()] );
}
}
diff --git a/includes/Block/Block.php b/includes/Block/Block.php
index b0c503a..b2861d3 100644
--- a/includes/Block/Block.php
+++ b/includes/Block/Block.php
@@ -79,11 +79,6 @@
 * @return bool
 */
public function canRender( $action );
-
-   /**
-* @param string $action
-*/
-   public function unsetRequiresWikitext( $action );
 }
 
 abstract class AbstractBlock implements Block {
@@ -120,9 +115,6 @@
 * @var array
 */
protected $supportedGetActions = array();
-
-   /** @var array */
-   protected $requiresWikitext = array();
 
/**
 * Templates for each view actions
@@ -342,16 +334,6 @@
 */
public function getEditToken() {
return $this->context->getUser()->getEditToken();
-   }
-
-   /**
-* @param string $action
-*/
-   public function unsetRequiresWikitext( $action ) {
-   $key = array_search( $action, $this->requiresWikitext );
-   if ( $key !== false ) {
-   unset( $this->requiresWikitext[$key] );
-   }
}
 
/**
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index b9ac998..951d479 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -41,11 +41,6 @@
/**
 * @var string[]
 */
-   protected $requiresWikitext = array( 'edit-header', 
'compare-header-revisions' );
-
-

[MediaWiki-commits] [Gerrit] Add content type: fixed-html - change (mediawiki...Flow)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add content type: fixed-html
..


Add content type: fixed-html

API is drawing a lot on view-* APIs, both for displaying content
& editing content (we're now directly using the html output in VE)

We need to be able to request 2 kinds of HTML: the one including
our ContentFixer adjustments (for output) & the one for VE, where
we need the original content.

This patch adds a 'fixed-html' content type. 'html' will from now
be the original, unfixed, html - the way VE needs it & we store it.
'fixed-html' is what we'll output, where ContentFixers are applied.

Bug: T90681
Change-Id: I3506c60790b03bf368a24d0964a81bda593c6aaf
---
M includes/Api/ApiFlowViewHeader.php
M includes/Api/ApiFlowViewPost.php
M includes/Api/ApiFlowViewTopicSummary.php
M includes/Block/Header.php
M includes/Block/Topic.php
M includes/Block/TopicSummary.php
M includes/Formatter/RevisionFormatter.php
M includes/TemplateHelper.php
M includes/Templating.php
M modules/editor/editors/ext.flow.editors.none.js
M modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
M modules/engine/misc/flow-handlebars.js
12 files changed, 33 insertions(+), 25 deletions(-)

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



diff --git a/includes/Api/ApiFlowViewHeader.php 
b/includes/Api/ApiFlowViewHeader.php
index 01aa15d..231beef 100644
--- a/includes/Api/ApiFlowViewHeader.php
+++ b/includes/Api/ApiFlowViewHeader.php
@@ -26,7 +26,7 @@
 
return array(
'format' => array(
-   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext' ),
+   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext', 'fixed-html' ),
ApiBase::PARAM_DFLT => $wgFlowContentFormat,
),
'revId' => null,
diff --git a/includes/Api/ApiFlowViewPost.php b/includes/Api/ApiFlowViewPost.php
index 7b68b56..fe56fbc 100644
--- a/includes/Api/ApiFlowViewPost.php
+++ b/includes/Api/ApiFlowViewPost.php
@@ -30,7 +30,7 @@
ApiBase::PARAM_REQUIRED => true,
),
'format' => array(
-   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext' ),
+   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext', 'fixed-html' ),
ApiBase::PARAM_DFLT => $wgFlowContentFormat,
),
'contentFormat' => array(
diff --git a/includes/Api/ApiFlowViewTopicSummary.php 
b/includes/Api/ApiFlowViewTopicSummary.php
index fc93ae7..d41abcc 100644
--- a/includes/Api/ApiFlowViewTopicSummary.php
+++ b/includes/Api/ApiFlowViewTopicSummary.php
@@ -26,7 +26,7 @@
 
return array(
'format' => array(
-   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext' ),
+   ApiBase::PARAM_TYPE => array( 'html', 
'wikitext', 'fixed-html' ),
ApiBase::PARAM_DFLT => $wgFlowContentFormat,
),
'revId' => null,
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 951d479..af3796e 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -195,7 +195,7 @@
 
switch ( $this->action ) {
case 'view':
-   $format = isset( $options['format'] ) ? 
$options['format'] : 'html';
+   $format = isset( $options['format'] ) ? 
$options['format'] : 'fixed-html';
$output += $this->renderRevisionApi( $format );
break;
 
@@ -213,7 +213,7 @@
if ( isset( $options['revId'] ) && 
$options['revId'] ) {
$output += $this->renderSingleViewApi( 
$options['revId'] );
} else {
-   $format = isset( $options['format'] ) ? 
$options['format'] : 'html';
+   $format = isset( $options['format'] ) ? 
$options['format'] : 'fixed-html';
$output += $this->renderRevisionApi( 
$format );
}
break;
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index fcf70c3..730378d 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -589,7 +589,7 @@
 
protected function renderTopicApi( array $options, $workflowId = '' ) {
$serializer = Container::get( 'formatter.topic' );
-   $format = isset( $options['format'] ) ? $options['format'] : 
'html';
+   $format = isset( $opt

[MediaWiki-commits] [Gerrit] Replace API param 'contentFormat' by 'format' - change (mediawiki...Flow)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace API param 'contentFormat' by 'format'
..


Replace API param 'contentFormat' by 'format'

In all write API's, we have a param called "format"; felt like this
is more consistent...

Change-Id: Ic0bf6394d2c327b2fac6ac7f7a4b24c3942d1986
---
M i18n/en.json
M i18n/qqq.json
M includes/Api/ApiFlowBasePost.php
M includes/Api/ApiFlowViewHeader.php
M includes/Api/ApiFlowViewPost.php
M includes/Api/ApiFlowViewTopicSummary.php
M includes/Block/Header.php
M includes/Block/Topic.php
M includes/Block/TopicSummary.php
M includes/Formatter/RevisionFormatter.php
M maintenance/convertToText.php
M modules/engine/components/board/base/flow-board-api-events.js
M tests/phpunit/api/ApiFlowViewHeaderTest.php
13 files changed, 50 insertions(+), 27 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 1584875..f2e092d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -472,17 +472,17 @@
"apihelp-flow+reply-example-1": "Reply to a post on 
[[Topic:S2tycnas4hcucw8w]]",
"apihelp-flow+reply-param-metadataonly": "Whether to include only 
metadata about the new content, excluding everything else",
"apihelp-flow+view-header-description": "View a board header.",
-   "apihelp-flow+view-header-param-contentFormat": "Format to return the 
content in.",
+   "apihelp-flow+view-header-param-format": "Format to return the content 
in.",
"apihelp-flow+view-header-param-revId": "Load this revision, instead of 
the most recent.",
"apihelp-flow+view-header-example-1": "Fetch the header of 
[[Talk:Sandbox]] as wikitext",
"apihelp-flow+view-post-description": "View a post.",
"apihelp-flow+view-post-param-postId": "ID of the post to view.",
-   "apihelp-flow+view-post-param-contentFormat": "Format to return the 
content in.",
+   "apihelp-flow+view-post-param-format": "Format to return the content 
in.",
"apihelp-flow+view-post-example-1": "Fetch the content of a post on 
[[Topic:S2tycnas4hcucw8w]] as wikitext",
"apihelp-flow+view-topic-description": "View a topic.",
"apihelp-flow+view-topic-example-1": "View [[Topic:S2tycnas4hcucw8w]]",
"apihelp-flow+view-topic-summary-description": "View a topic summary.",
-   "apihelp-flow+view-topic-summary-param-contentFormat": "Format to 
return the content in.",
+   "apihelp-flow+view-topic-summary-param-format": "Format to return the 
content in.",
"apihelp-flow+view-topic-summary-param-revId": "Load this revision, 
instead of the most recent.",
"apihelp-flow+view-topic-summary-example-1": "View the summary for 
[[Topic:S2tycnas4hcucw8w]] as wikitext",
"apihelp-flow+view-topiclist-description": "View a list of topics.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 65615ca..7903c62 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -475,17 +475,17 @@
"apihelp-flow+reply-example-1": "{{doc-apihelp-example|flow+reply}}",
"apihelp-flow+reply-param-metadataonly": 
"{{doc-apihelp-param|flow+reply|metadataonly}}",
"apihelp-flow+view-header-description": 
"{{doc-apihelp-description|flow+view-header}}",
-   "apihelp-flow+view-header-param-contentFormat": 
"{{doc-apihelp-param|flow+view-header|contentFormat}}",
+   "apihelp-flow+view-header-param-format": 
"{{doc-apihelp-param|flow+view-header|format}}",
"apihelp-flow+view-header-param-revId": 
"{{doc-apihelp-param|flow+view-header|revId}}",
"apihelp-flow+view-header-example-1": 
"{{doc-apihelp-example|flow+view-header}}",
"apihelp-flow+view-post-description": 
"{{doc-apihelp-description|flow+view-post}}",
"apihelp-flow+view-post-param-postId": 
"{{doc-apihelp-param|flow+view-post|postId}}",
-   "apihelp-flow+view-post-param-contentFormat": 
"{{doc-apihelp-param|flow+view-post|contentFormat}}",
+   "apihelp-flow+view-post-param-format": 
"{{doc-apihelp-param|flow+view-post|format}}",
"apihelp-flow+view-post-example-1": 
"{{doc-apihelp-example|flow+view-post}}",
"apihelp-flow+view-topic-description": 
"{{doc-apihelp-description|flow+view-topic}}",
"apihelp-flow+view-topic-example-1": 
"{{doc-apihelp-example|flow+view-topic}}",
"apihelp-flow+view-topic-summary-description": 
"{{doc-apihelp-description|flow+view-topic-summary}}",
-   "apihelp-flow+view-topic-summary-param-contentFormat": 
"{{doc-apihelp-param|flow+view-topic-summary|contentFormat}}",
+   "apihelp-flow+view-topic-summary-param-format": 
"{{doc-apihelp-param|flow+view-topic-summary|format}}",
"apihelp-flow+view-topic-summary-param-revId": 
"{{doc-apihelp-param|flow+view-topic-summary|revId}}",
"apihelp-flow+view-topic-summary-example-1": 
"{{doc-apihelp-example|flow+view-topic-summary}}",
"apihelp-flow+view-top

[MediaWiki-commits] [Gerrit] Hygiene: Make schema MobileFrontend agnostic - change (mediawiki...MobileFrontend)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Make schema MobileFrontend agnostic
..


Hygiene: Make schema MobileFrontend agnostic

Gather uses Schema but since it works outside MobileFrontend in Vector
wgMFMode is not available

Change-Id: I0554b6a0daecfc4d72ba0c6f886ec0574dc76105
---
M includes/MobileFrontend.hooks.php
M javascripts/Schema.js
A javascripts/loggingSchemas/SchemaMobileWeb.js
M javascripts/loggingSchemas/SchemaMobileWebClickTracking.js
M javascripts/loggingSchemas/SchemaMobileWebEditing.js
M javascripts/loggingSchemas/SchemaMobileWebUploads.js
6 files changed, 34 insertions(+), 14 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index f773478..c6ccaf9 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -958,6 +958,7 @@
}
 
$scripts = array(
+   'javascripts/loggingSchemas/SchemaMobileWeb.js',
'javascripts/loggingSchemas/SchemaMobileWebUploads.js',

'javascripts/loggingSchemas/SchemaMobileWebClickTracking.js',
'javascripts/loggingSchemas/SchemaMobileWebEditing.js',
diff --git a/javascripts/Schema.js b/javascripts/Schema.js
index 4cd909c..f471e70 100644
--- a/javascripts/Schema.js
+++ b/javascripts/Schema.js
@@ -1,7 +1,6 @@
 ( function ( M, $ ) {
var Schema,
Class = M.require( 'Class' ),
-   context = M.require( 'context' ),
user = M.require( 'user' );
 
/**
@@ -13,11 +12,8 @@
 * A set of defaults to log to the schema
 *
 * @cfg {Object} defaults Default options hash.
-* @cfg {String} defaults.mobileMode whether user is in stable 
beta or alpha
 */
-   defaults: {
-   mobileMode: context.getMode()
-   },
+   defaults: {},
/**
 * Whether or not the logging is sampled (i.e. not recorded at 
100% frequency)
 * @property {Boolean}
diff --git a/javascripts/loggingSchemas/SchemaMobileWeb.js 
b/javascripts/loggingSchemas/SchemaMobileWeb.js
new file mode 100644
index 000..b4e8ef6
--- /dev/null
+++ b/javascripts/loggingSchemas/SchemaMobileWeb.js
@@ -0,0 +1,23 @@
+( function ( M, $ ) {
+   var SchemaMobileWeb,
+   Schema = M.require( 'Schema' ),
+   context = M.require( 'context' );
+
+   /**
+* @class SchemaMobileWeb
+* @extends Schema
+*/
+   SchemaMobileWeb = Schema.extend( {
+   /**
+* @inheritdoc
+*
+* @cfg {Object} defaults Default options hash.
+* @cfg {String} defaults.mobileMode whether user is in stable 
beta or alpha
+*/
+   defaults: $.extend( {}, Schema.prototype.defaults, {
+   mobileMode: context.getMode()
+   } )
+   } );
+
+   M.define( 'loggingSchemas/SchemaMobileWeb', SchemaMobileWeb );
+} )( mw.mobileFrontend, jQuery );
diff --git a/javascripts/loggingSchemas/SchemaMobileWebClickTracking.js 
b/javascripts/loggingSchemas/SchemaMobileWebClickTracking.js
index 81f0fbc..7eb249c 100644
--- a/javascripts/loggingSchemas/SchemaMobileWebClickTracking.js
+++ b/javascripts/loggingSchemas/SchemaMobileWebClickTracking.js
@@ -1,6 +1,6 @@
 ( function ( M, $ ) {
var SchemaMobileWebClickTracking,
-   Schema = M.require( 'Schema' ),
+   SchemaMobileWeb = M.require( 'loggingSchemas/SchemaMobileWeb' ),
user = M.require( 'user' ),
s = M.require( 'settings' );
 
@@ -49,7 +49,7 @@
 * @class SchemaMobileWebClickTracking
 * @extends Schema
 */
-   SchemaMobileWebClickTracking = Schema.extend( {
+   SchemaMobileWebClickTracking = SchemaMobileWeb.extend( {
/**
 * @inheritdoc
 *
@@ -62,7 +62,7 @@
 * logger omit this property when sending the data to a server. 
According to the schema
 * userEditCount is optional.
 */
-   defaults: $.extend( {}, Schema.prototype.defaults, {
+   defaults: $.extend( {}, SchemaMobileWeb.prototype.defaults, {
// FIXME: Introduce a SchemaWithUser class that has 
username and userEditCount
username: user.getName() || undefined,
userEditCount: typeof user.getEditCount() === 'number' 
? user.getEditCount() : undefined
diff --git a/javascripts/loggingSchemas/SchemaMobileWebEditing.js 
b/javascripts

[MediaWiki-commits] [Gerrit] T86663 4.4: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.4: shuffle roles, no repool yet
..


T86663 4.4: shuffle roles, no repool yet

Change-Id: I8badb8e551681abfe94d1a02650c7033f6b3919f
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7818b57..ae6d047 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -73,6 +73,7 @@
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
+# 'cp3014.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -147,7 +148,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
@@ -174,10 +174,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
+# 'cp3018.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 36d9874..6f6b36d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp301[123]\.esams\.wmnet$/ {
+node /^cp301[1234]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|18)\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10)\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[4567]\.esams\.wmnet$/ {
+node /^cp301[5678]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8badb8e551681abfe94d1a02650c7033f6b3919f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.4: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.4: shuffle roles, no repool yet
..

T86663 4.4: shuffle roles, no repool yet

Change-Id: I8badb8e551681abfe94d1a02650c7033f6b3919f
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/202972/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7818b57..ae6d047 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -73,6 +73,7 @@
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
+# 'cp3014.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -147,7 +148,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
@@ -174,10 +174,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
+# 'cp3018.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 36d9874..6f6b36d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp301[123]\.esams\.wmnet$/ {
+node /^cp301[1234]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|18)\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10)\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[4567]\.esams\.wmnet$/ {
+node /^cp301[5678]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

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

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

[MediaWiki-commits] [Gerrit] Stop doing pointless Parsoid roundtrips - change (mediawiki...Flow)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Stop doing pointless Parsoid roundtrips
..


Stop doing pointless Parsoid roundtrips

If editor is VE, might as well request html immediately,
instead of first converting it to wikitext (on server),
then fire another API call to convert back to html.

Made editor.load stop taking content format, it's now
expected to just give it the correct format.
The only place that will still automatically convert is
editor switcher.

Bug: T90681
Change-Id: I73c133f6bb112243e28cb7fd716f45880611c73d
---
M modules/editor/ext.flow.editor.js
M modules/engine/components/board/base/flow-board-api-events.js
M modules/engine/components/common/flow-component-events.js
3 files changed, 23 insertions(+), 32 deletions(-)

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



diff --git a/modules/editor/ext.flow.editor.js 
b/modules/editor/ext.flow.editor.js
index c86ccf8..59b7731 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -57,43 +57,30 @@
/**
 * @param {jQuery} $node
 * @param {string} [content] Existing content to load, in any 
format
-* @param {string} [contentFormat] The format that content is 
in, or null (defaults to wikitext)
 * @return {jQuery.Promise} Will resolve once editor instance 
is loaded
 */
-   load: function ( $node, content, contentFormat ) {
+   load: function ( $node, content ) {
/**
-* When calling load(), init() may not yet have 
completed loading the
+* When calling load(), loadEditor() may not yet have 
completed loading the
 * dependencies. To make sure it doesn't break, this 
will in interval,
 * check for it and only start loading once 
initialization is complete.
 */
-   var load = function ( $node, content, contentFormat ) {
+   var load = function ( $node, content ) {
if ( mw.flow.editor.editor === null ) {
return;
} else {
clearTimeout( interval );
}
 
-   if ( contentFormat === undefined ) {
-   contentFormat = 'wikitext';
+   // doublecheck if editor doesn't already exist 
for this node
+   if ( !mw.flow.editor.getEditor( $node ) ) {
+   mw.flow.editor.create( $node, content );
}
 
-   // quit early if editor is already loaded
-   if ( mw.flow.editor.getEditor( $node ) ) {
-   deferred.resolve();
-   return;
-   }
-
-   mw.flow.parsoid.convert( contentFormat, 
mw.flow.editor.getFormat( $node ), content )
-   .done( function( content ) {
-   mw.flow.editor.create( $node, 
content );
-   deferred.resolve();
-   })
-   .fail( function() {
-   deferred.reject();
-   });
+   deferred.resolve();
},
deferred = $.Deferred(),
-   interval = setInterval( $.proxy( load, this, $node, 
content, contentFormat ), 10 );
+   interval = setInterval( $.proxy( load, this, $node, 
content ), 10 );
 
return deferred.promise();
},
@@ -196,19 +183,26 @@
 * @return {jQuery.Promise} Will resolve once editor instance 
is loaded
 */
switchEditor: function ( $node, desiredEditor ) {
-   var content, format,
+   var content, oldFormat, newFormat,
editorList = mw.config.get( 'wgFlowEditorList' 
),
editor = mw.flow.editor.getEditor( $node ),
deferred = $.Deferred(),
performSwitch = function () {
if ( 
mw.flow.editors[desiredEditor].static.isSupported() ) {
content = 
editor.getRawContent();
-   format = 
editor.constr

[MediaWiki-commits] [Gerrit] Get rid of redundant use's - change (mediawiki...Flow)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Get rid of redundant use's
..


Get rid of redundant use's

Change-Id: I775a834def4d171f38a530e0e663fccb15c0f0b7
---
M includes/Api/ApiParsoidUtilsFlow.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/Api/ApiParsoidUtilsFlow.php 
b/includes/Api/ApiParsoidUtilsFlow.php
index d16ccc5..66f5575 100644
--- a/includes/Api/ApiParsoidUtilsFlow.php
+++ b/includes/Api/ApiParsoidUtilsFlow.php
@@ -3,8 +3,6 @@
 namespace Flow\Api;
 
 use ApiBase;
-use Flow\Container;
-use Flow\Parsoid\ContentFixer;
 use Flow\Parsoid\Utils;
 use Flow\Exception\WikitextException;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I775a834def4d171f38a530e0e663fccb15c0f0b7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
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] Add help link to three rather important pages - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add help link to three rather important pages
..


Add help link to three rather important pages

* Specialpages is a useful hub, but not so visited. The help
  page is currently not that good, but is not controversial either.
* Preferences should obviously be better, but may be better than
  nothing. Some explanations and links there are definitely useful.
* Categories don't worry much and there's no doubt they require more
  education to be really understandable and useful for users. They
  are however sort of content pages, if users start thinking they can
  get help about the contents of the categories of specific wikis
  we'll need to remove the link.

Bug: T45591
Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
(cherry picked from commit e2e2859ec207dcc4810da46b8b4c96f8355202a6)
---
M includes/page/CategoryPage.php
M includes/specials/SpecialPreferences.php
M includes/specials/SpecialSpecialpages.php
3 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/page/CategoryPage.php b/includes/page/CategoryPage.php
index 03a5b89..2edf1af 100644
--- a/includes/page/CategoryPage.php
+++ b/includes/page/CategoryPage.php
@@ -113,6 +113,8 @@
$until,
$reqArray
);
-   $this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
+   $out = $this->getContext()->getOutput();
+   $out->addHTML( $viewer->getHTML() );
+   $out->addHelpLink( 'Help:Categories' );
}
 }
diff --git a/includes/specials/SpecialPreferences.php 
b/includes/specials/SpecialPreferences.php
index cea00fa..ef61f94 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -55,6 +55,8 @@
);
}
 
+   $out->addHelpLink( 'Help:Preferences' );
+
$htmlForm = Preferences::getFormObject( $this->getUser(), 
$this->getContext() );
$htmlForm->setSubmitCallback( array( 'Preferences', 
'tryUISubmit' ) );
 
diff --git a/includes/specials/SpecialSpecialpages.php 
b/includes/specials/SpecialSpecialpages.php
index eff06f4..ed3ad5b 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -45,6 +45,7 @@
return;
}
 
+   $out->addHelpLink( 'Help:Special pages' );
$this->outputPageList( $groups );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Revert "dumps: ferm service for rsyncd clients using... - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: Revert "Revert "dumps: ferm service for rsyncd clients using 
hiera""
..

Revert "Revert "dumps: ferm service for rsyncd clients using hiera""

This reverts commit e2babb0916f5a9680066aaa6dcf8b2f8db1bacce.

Change-Id: I52c83eb9134101ac97be4225d8587d1ef4859c7a
---
M manifests/role/dumps.pp
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/202971/1

diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index e2ef5e1..0a0929f 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -9,4 +9,14 @@
 description   => 'HTTP',
 check_command => 'check_http'
 }
+
+$rsync_clients = hiera('dumps::rsync_clients')
+$rsync_clients_ferm = join($rsync_clients, ' ')
+
+ferm::service {'dumps-rsyncd':
+port   => '873',
+proto  => 'tcp',
+srange => "@resolve(($rsync_clients_ferm))",
+}
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52c83eb9134101ac97be4225d8587d1ef4859c7a
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] T86663 4.4: pool 3045; depool 3018,3014,amssq49-50 - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.4: pool 3045; depool 3018,3014,amssq49-50
..


T86663 4.4: pool 3045; depool 3018,3014,amssq49-50

Change-Id: I07f9645647f99e9fc9b2a111c1c300a0fc26525c
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index acccbfc..7818b57 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -77,8 +77,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq49.esams.wmnet',
-'amssq50.esams.wmnet',
 'amssq51.esams.wmnet',
 'amssq52.esams.wmnet',
 'amssq53.esams.wmnet',
@@ -149,7 +147,7 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3018.esams.wmnet',
+# 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
@@ -157,6 +155,7 @@
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
 'cp3044.esams.wmnet',
+'cp3045.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4005.ulsfo.wmnet',
@@ -175,7 +174,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3014.esams.wmnet',
+# 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07f9645647f99e9fc9b2a111c1c300a0fc26525c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.4: pool 3045; depool 3018,3014,amssq49-50 - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.4: pool 3045; depool 3018,3014,amssq49-50
..

T86663 4.4: pool 3045; depool 3018,3014,amssq49-50

Change-Id: I07f9645647f99e9fc9b2a111c1c300a0fc26525c
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/202970/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index acccbfc..7818b57 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -77,8 +77,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq49.esams.wmnet',
-'amssq50.esams.wmnet',
 'amssq51.esams.wmnet',
 'amssq52.esams.wmnet',
 'amssq53.esams.wmnet',
@@ -149,7 +147,7 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3018.esams.wmnet',
+# 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
@@ -157,6 +155,7 @@
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
 'cp3044.esams.wmnet',
+'cp3045.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4005.ulsfo.wmnet',
@@ -175,7 +174,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3014.esams.wmnet',
+# 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] dumps: move hiera data to new location - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: dumps: move hiera data to new location
..


dumps: move hiera data to new location

Change-Id: I95196267444df4a7e23639cbf33e69b34766a277
---
R hieradata/common/dumps.yaml
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/dumps.yaml b/hieradata/common/dumps.yaml
similarity index 100%
rename from hieradata/role/common/dumps.yaml
rename to hieradata/common/dumps.yaml

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

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

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

[MediaWiki-commits] [Gerrit] T86663 4.3: repool cp301[37] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.3: repool cp301[37]
..


T86663 4.3: repool cp301[37]

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

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 8f738d5..acccbfc 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -72,7 +72,7 @@
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
-# 'cp3013.esams.wmnet',
+'cp3013.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -178,7 +178,7 @@
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
-# 'cp3017.esams.wmnet',
+'cp3017.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaab824c3fb7fd12faa6b430386c24adbb1aa21d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.3: repool cp301[37] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.3: repool cp301[37]
..

T86663 4.3: repool cp301[37]

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/202969/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 8f738d5..acccbfc 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -72,7 +72,7 @@
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
-# 'cp3013.esams.wmnet',
+'cp3013.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -178,7 +178,7 @@
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
-# 'cp3017.esams.wmnet',
+'cp3017.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] Use XML localName when importing - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use XML localName when importing
..


Use XML localName when importing

XMLReader#name gives the qualified name, which was not a good thing to use.

Bug: T6520
Change-Id: I8174fe64791f0e8d0c6677169595201446eab583
---
M includes/Import.php
1 file changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/includes/Import.php b/includes/Import.php
index de453b5..a4424bc 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -523,10 +523,10 @@
$oldDisable = libxml_disable_entity_loader( true );
$this->reader->read();
 
-   if ( $this->reader->name != 'mediawiki' ) {
+   if ( $this->reader->localName != 'mediawiki' ) {
libxml_disable_entity_loader( $oldDisable );
throw new MWException( "Expected  tag, got " 
.
-   $this->reader->name );
+   $this->reader->localName );
}
$this->debug( " tag is correct." );
 
@@ -537,7 +537,7 @@
$rethrow = null;
try {
while ( $keepReading ) {
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
$type = $this->reader->nodeType;
 
if ( !Hooks::run( 'ImportHandleToplevelXMLTag', 
array( $this ) ) ) {
@@ -588,11 +588,11 @@
 
while ( $this->reader->read() ) {
if ( $this->reader->nodeType == XmlReader::END_ELEMENT 
&&
-   $this->reader->name == 'siteinfo' ) {
+   $this->reader->localName == 'siteinfo' 
) {
break;
}
 
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
 
if ( $tag == 'namespace' ) {
$this->foreignNamespaces[ $this->nodeAttribute( 
'key' ) ] =
@@ -616,11 +616,11 @@
 
while ( $this->reader->read() ) {
if ( $this->reader->nodeType == XMLReader::END_ELEMENT 
&&
-   $this->reader->name == 'logitem' ) {
+   $this->reader->localName == 'logitem' ) 
{
break;
}
 
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
 
if ( !Hooks::run( 'ImportHandleLogItemXMLTag', array(
$this, $logInfo
@@ -680,13 +680,13 @@
 
while ( $skip ? $this->reader->next() : $this->reader->read() ) 
{
if ( $this->reader->nodeType == XMLReader::END_ELEMENT 
&&
-   $this->reader->name == 'page' ) {
+   $this->reader->localName == 'page' ) {
break;
}
 
$skip = false;
 
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
 
if ( $badTitle ) {
// The title is invalid, bail out of this page
@@ -753,11 +753,11 @@
 
while ( $skip ? $this->reader->next() : $this->reader->read() ) 
{
if ( $this->reader->nodeType == XMLReader::END_ELEMENT 
&&
-   $this->reader->name == 'revision' ) {
+   $this->reader->localName == 'revision' 
) {
break;
}
 
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
 
if ( !Hooks::run( 'ImportHandleRevisionXMLTag', array(
$this, $pageInfo, $revisionInfo
@@ -845,11 +845,11 @@
 
while ( $skip ? $this->reader->next() : $this->reader->read() ) 
{
if ( $this->reader->nodeType == XMLReader::END_ELEMENT 
&&
-   $this->reader->name == 'upload' ) {
+   $this->reader->localName == 'upload' ) {
break;
}
 
-   $tag = $this->reader->name;
+   $tag = $this->reader->localName;
 
if ( !Hooks::run( 'ImportHandleUploadXMLTag', array(
$this, $pageInfo
@@ -943,11 +943,11 @@
 
while ( $this->reader->read() ) {

[MediaWiki-commits] [Gerrit] Set context earlier in ImageListPager::__construct - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Set context earlier in ImageListPager::__construct
..


Set context earlier in ImageListPager::__construct

The parent constructor sets the $context for the Page, but the getConfig
is before the call, which results in a warning for using
RequestContext::getMain(). Just set the context before use.

Change-Id: Icf3faefe8c20c017a479f07594809dfb003db9af
---
M includes/specials/SpecialListfiles.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialListfiles.php 
b/includes/specials/SpecialListfiles.php
index d4b45fb..7576c1f 100644
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -84,6 +84,7 @@
function __construct( IContextSource $context, $userName = null, 
$search = '',
$including = false, $showAll = false
) {
+   $this->setContext( $context );
$this->mIncluding = $including;
$this->mShowAll = $showAll;
 
@@ -107,7 +108,7 @@
}
 
if ( !$including ) {
-   if ( $context->getRequest()->getText( 'sort', 
'img_date' ) == 'img_date' ) {
+   if ( $this->getRequest()->getText( 'sort', 'img_date' ) 
== 'img_date' ) {
$this->mDefaultDirection = 
IndexPager::DIR_DESCENDING;
} else {
$this->mDefaultDirection = 
IndexPager::DIR_ASCENDING;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf3faefe8c20c017a479f07594809dfb003db9af
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Make VisualEditor access RESTbase directly on Wikipe... - change (operations/mediawiki-config)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Make VisualEditor access RESTbase directly on 
Wikipedias"
..


Revert "Make VisualEditor access RESTbase directly on Wikipedias"

Significantly increased load times :(

This reverts commit 107a92392c7f23b48300a3c11cb5c2472c966de9.

Change-Id: I85a202ddb888dae12ae01d981cdf5b9b1025adc7
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1af26fb..1744f7d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12351,7 +12351,6 @@
'test2wiki' => true,
'testwikidatawiki' => true,
'enwiki' => true,
-   'wikipedia' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85a202ddb888dae12ae01d981cdf5b9b1025adc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
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] Skip file count on Special:Statistics when no files and no u... - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Skip file count on Special:Statistics when no files and no 
upload
..


Skip file count on Special:Statistics when no files and no upload

There is no need to show the number of zero files on Special:Statistics
when it is not possible to upload files, but it is needed, when some
files already uploaded even if the upload is disabled later.

Change-Id: I4431166ebc8e952e5d926d874b56c743bebcbef1
---
M includes/specials/SpecialStatistics.php
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialStatistics.php 
b/includes/specials/SpecialStatistics.php
index 1f339d1..0acbf95 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -126,7 +126,7 @@
 * @return string
 */
private function getPageStats() {
-   return Xml::openElement( 'tr' ) .
+   $pageStatsHtml = Xml::openElement( 'tr' ) .
Xml::tags( 'th', array( 'colspan' => '2' ), $this->msg( 
'statistics-header-pages' )->parse() ) .
Xml::closeElement( 'tr' ) .
$this->formatRow( Linker::linkKnown( 
SpecialPage::getTitleFor( 'Allpages' ),
@@ -136,11 +136,17 @@
$this->formatRow( $this->msg( 
'statistics-pages' )->parse(),
$this->getLanguage()->formatNum( 
$this->total ),
array( 'class' => 'mw-statistics-pages' 
),
-   'statistics-pages-desc' ) .
-   $this->formatRow( Linker::linkKnown( 
SpecialPage::getTitleFor( 'MediaStatistics' ),
-   $this->msg( 'statistics-files' 
)->parse() ),
-   $this->getLanguage()->formatNum( 
$this->images ),
-   array( 'class' => 'mw-statistics-files' 
) );
+   'statistics-pages-desc' );
+
+   // Show the image row only, when there are files or upload is 
possible
+   if ( $this->images !== 0 || $this->getConfig()->get( 
'EnableUploads' ) ) {
+   $pageStatsHtml .= $this->formatRow( Linker::linkKnown( 
SpecialPage::getTitleFor( 'MediaStatistics' ),
+   $this->msg( 'statistics-files' )->parse() ),
+   $this->getLanguage()->formatNum( $this->images 
),
+   array( 'class' => 'mw-statistics-files' ) );
+   }
+
+   return $pageStatsHtml;
}
 
private function getEditStats() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4431166ebc8e952e5d926d874b56c743bebcbef1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] Add help link to three rather important pages - change (mediawiki/core)

2015-04-08 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Add help link to three rather important pages
..

Add help link to three rather important pages

* Specialpages is a useful hub, but not so visited. The help
  page is currently not that good, but is not controversial either.
* Preferences should obviously be better, but may be better than
  nothing. Some explanations and links there are definitely useful.
* Categories don't worry much and there's no doubt they require more
  education to be really understandable and useful for users. They
  are however sort of content pages, if users start thinking they can
  get help about the contents of the categories of specific wikis
  we'll need to remove the link.

Bug: T45591
Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
(cherry picked from commit e2e2859ec207dcc4810da46b8b4c96f8355202a6)
---
M includes/page/CategoryPage.php
M includes/specials/SpecialPreferences.php
M includes/specials/SpecialSpecialpages.php
3 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/202968/1

diff --git a/includes/page/CategoryPage.php b/includes/page/CategoryPage.php
index 03a5b89..2edf1af 100644
--- a/includes/page/CategoryPage.php
+++ b/includes/page/CategoryPage.php
@@ -113,6 +113,8 @@
$until,
$reqArray
);
-   $this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
+   $out = $this->getContext()->getOutput();
+   $out->addHTML( $viewer->getHTML() );
+   $out->addHelpLink( 'Help:Categories' );
}
 }
diff --git a/includes/specials/SpecialPreferences.php 
b/includes/specials/SpecialPreferences.php
index cea00fa..ef61f94 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -55,6 +55,8 @@
);
}
 
+   $out->addHelpLink( 'Help:Preferences' );
+
$htmlForm = Preferences::getFormObject( $this->getUser(), 
$this->getContext() );
$htmlForm->setSubmitCallback( array( 'Preferences', 
'tryUISubmit' ) );
 
diff --git a/includes/specials/SpecialSpecialpages.php 
b/includes/specials/SpecialSpecialpages.php
index eff06f4..ed3ad5b 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -45,6 +45,7 @@
return;
}
 
+   $out->addHelpLink( 'Help:Special pages' );
$this->outputPageList( $groups );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Nemo bis 

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

[MediaWiki-commits] [Gerrit] PLURAL support for list lengths in default-skin-not-found - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: PLURAL support for list lengths in default-skin-not-found
..


PLURAL support for list lengths in default-skin-not-found

https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Default-skin-not-found/en_(2)

Change-Id: I7cfde0743f9a97927b3db134b1f0ae51950f8a3f
---
M includes/skins/SkinFallbackTemplate.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/skins/SkinFallbackTemplate.php 
b/includes/skins/SkinFallbackTemplate.php
index 9cb4ea0..f04fa37 100644
--- a/includes/skins/SkinFallbackTemplate.php
+++ b/includes/skins/SkinFallbackTemplate.php
@@ -63,7 +63,9 @@
return $this->getMsg( 'default-skin-not-found' 
)->params(
$defaultSkin,
implode( "\n", $skinsInstalledText ),
-   implode( "\n", $skinsInstalledSnippet )
+   implode( "\n", $skinsInstalledSnippet ) 
)->numParams(
+   count( $skinsInstalledText ),
+   count( $skinsInstalledSnippet )
)->parseAsBlock();
} else {
return $this->getMsg( 'default-skin-not-found-no-skins' 
)->params(
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index fb7056c..5deec27 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3649,7 +3649,7 @@
"log-name-pagelang": "Change language log",
"log-description-pagelang": "This is a log of changes in page 
languages.",
"logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} page language 
for $3 from $4 to $5.",
-   "default-skin-not-found": "Whoops! The default skin for your wiki, 
defined in $wgDefaultSkin as $1, is not 
available.\n\nYour installation seems to include the following skins. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable them and choose the 
default.\n\n$2\n\n; If you have just installed MediaWiki:\n: You probably 
installed from git, or directly from the source code using some other method. 
This is expected. Try installing some skins from 
[https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* Cloning one of the mediawiki/skins/* 
repositories via git into the skins/ directory of your 
MediaWiki installation.\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer.\n\n; If you have just upgraded 
MediaWiki:\n: MediaWiki 1.24 and newer no longer automatically enables 
installed skins (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery 
Manual: Skin autodiscovery]). You can paste the following lines into 
LocalSettings.php to enable all currently installed skins:\n\n$3\n\n; If you have just modified 
LocalSettings.php:\n: Double-check the skin names for typos.",
+   "default-skin-not-found": "Whoops! The default skin for your wiki, 
defined in $wgDefaultSkin as $1, is not 
available.\n\nYour installation seems to include the following 
{{PLURAL:$4|skin|skins}}. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable {{PLURAL:$4|it|them and choose the 
default}}.\n\n$2\n\n; If you have just installed MediaWiki:\n: You probably 
installed from git, or directly from the source code using some other method. 
This is expected. Try installing some skins from 
[https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* Cloning one of the mediawiki/skins/* 
repositories via git into the skins/ directory of your 
MediaWiki installation.\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer.\n\n; If you have just upgraded 
MediaWiki:\n: MediaWiki 1.24 and newer no longer automatically enables 
installed skins (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery 
Manual: Skin autodiscovery]). You can paste the following 
{{PLURAL:$5|line|lines

[MediaWiki-commits] [Gerrit] Add help link to three rather important pages - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add help link to three rather important pages
..


Add help link to three rather important pages

* Specialpages is a useful hub, but not so visited. The help
  page is currently not that good, but is not controversial either.
* Preferences should obviously be better, but may be better than
  nothing. Some explanations and links there are definitely useful.
* Categories don't worry much and there's no doubt they require more
  education to be really understandable and useful for users. They
  are however sort of content pages, if users start thinking they can
  get help about the contents of the categories of specific wikis
  we'll need to remove the link.

Bug: T45591
Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
---
M includes/page/CategoryPage.php
M includes/specials/SpecialPreferences.php
M includes/specials/SpecialSpecialpages.php
3 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/page/CategoryPage.php b/includes/page/CategoryPage.php
index 03a5b89..2edf1af 100644
--- a/includes/page/CategoryPage.php
+++ b/includes/page/CategoryPage.php
@@ -113,6 +113,8 @@
$until,
$reqArray
);
-   $this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
+   $out = $this->getContext()->getOutput();
+   $out->addHTML( $viewer->getHTML() );
+   $out->addHelpLink( 'Help:Categories' );
}
 }
diff --git a/includes/specials/SpecialPreferences.php 
b/includes/specials/SpecialPreferences.php
index cea00fa..ef61f94 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -55,6 +55,8 @@
);
}
 
+   $out->addHelpLink( 'Help:Preferences' );
+
$htmlForm = Preferences::getFormObject( $this->getUser(), 
$this->getContext() );
$htmlForm->setSubmitCallback( array( 'Preferences', 
'tryUISubmit' ) );
 
diff --git a/includes/specials/SpecialSpecialpages.php 
b/includes/specials/SpecialSpecialpages.php
index eff06f4..ed3ad5b 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -45,6 +45,7 @@
return;
}
 
+   $out->addHelpLink( 'Help:Special pages' );
$this->outputPageList( $groups );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7445419864e85685b3ca0cf8333f38b284c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Happy-melon 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
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] T86663 4.3: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.3: shuffle roles, no repool yet
..


T86663 4.3: shuffle roles, no repool yet

Change-Id: I24219d994870207d2bec83967d88a452451d3c9a
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2233618..8f738d5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -72,6 +72,7 @@
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
+# 'cp3013.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -148,7 +149,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
@@ -175,10 +175,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
+# 'cp3017.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index a8b94aa..36d9874 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp301[12]\.esams\.wmnet$/ {
+node /^cp301[123]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10|18)\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[3456]\.esams\.wmnet$/ {
+node /^cp301[4567]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24219d994870207d2bec83967d88a452451d3c9a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.3: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.3: shuffle roles, no repool yet
..

T86663 4.3: shuffle roles, no repool yet

Change-Id: I24219d994870207d2bec83967d88a452451d3c9a
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/202967/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2233618..8f738d5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -72,6 +72,7 @@
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3012.esams.wmnet',
+# 'cp3013.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -148,7 +149,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
@@ -175,10 +175,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
+# 'cp3017.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index a8b94aa..36d9874 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp301[12]\.esams\.wmnet$/ {
+node /^cp301[123]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10|18)\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[3456]\.esams\.wmnet$/ {
+node /^cp301[4567]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Make VisualEditor access RESTbase directly on Wikipe... - change (operations/mediawiki-config)

2015-04-08 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Revert "Make VisualEditor access RESTbase directly on 
Wikipedias"
..

Revert "Make VisualEditor access RESTbase directly on Wikipedias"

Significantly increased load times :(

This reverts commit 107a92392c7f23b48300a3c11cb5c2472c966de9.

Change-Id: I85a202ddb888dae12ae01d981cdf5b9b1025adc7
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1af26fb..1744f7d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12351,7 +12351,6 @@
'test2wiki' => true,
'testwikidatawiki' => true,
'enwiki' => true,
-   'wikipedia' => true,
 ),
 
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85a202ddb888dae12ae01d981cdf5b9b1025adc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Added LogEntryBase::extractParams/makeParamBlob - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Added LogEntryBase::extractParams/makeParamBlob
..


Added LogEntryBase::extractParams/makeParamBlob

Centralize the serialize and unserialize call in the new logging system
into two functions to allow reuse by tests.

Change-Id: Ibedca39558cbd51b20e7ebb9d2b6537e4f24
---
M includes/logging/LogEntry.php
1 file changed, 26 insertions(+), 4 deletions(-)

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



diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 66c2bde..b391be3 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -115,6 +115,28 @@
public function isLegacy() {
return false;
}
+
+   /**
+* Create a blob from a parameter array
+*
+* @param array $params
+* @return string
+* @since 1.26
+*/
+   public static function makeParamBlob( $params ) {
+   return serialize( (array)$params );
+   }
+
+   /**
+* Extract a parameter array from a blob
+*
+* @param string $blob
+* @return array
+* @since 1.26
+*/
+   public static function extractParams( $blob ) {
+   return unserialize( $blob );
+   }
 }
 
 /**
@@ -225,13 +247,13 @@
if ( !isset( $this->params ) ) {
$blob = $this->getRawParameters();
wfSuppressWarnings();
-   $params = unserialize( $blob );
+   $params = LogEntryBase::extractParams( $blob );
wfRestoreWarnings();
if ( $params !== false ) {
$this->params = $params;
$this->legacy = false;
} else {
-   $this->params = $blob === '' ? array() : 
explode( "\n", $blob );
+   $this->params = LogPage::extractParams( $blob );
$this->legacy = true;
}
}
@@ -516,7 +538,7 @@
'log_title' => $this->getTarget()->getDBkey(),
'log_page' => $this->getTarget()->getArticleID(),
'log_comment' => $comment,
-   'log_params' => serialize( 
(array)$this->getParameters() ),
+   'log_params' => LogEntryBase::makeParamBlob( 
$this->getParameters() ),
);
if ( isset( $this->deleted ) ) {
$data['log_deleted'] = $this->deleted;
@@ -584,7 +606,7 @@
$this->getSubtype(),
$this->getTarget(),
$this->getComment(),
-   serialize( (array)$this->getParameters() ),
+   LogEntryBase::makeParamBlob( $this->getParameters() ),
$newId,
$formatter->getIRCActionComment() // Used for IRC feeds
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibedca39558cbd51b20e7ebb9d2b6537e4f24
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Convert extensions to use generic phpunit job (D-E) - change (integration/config)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert extensions to use generic phpunit job (D-E)
..


Convert extensions to use generic phpunit job (D-E)

Change-Id: Iaf7956671c940e10a03976a744c616134f2badcc
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 34 insertions(+), 70 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index a4d22a9..cc27505 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -359,55 +359,19 @@
 dependencies: 'UniversalLanguageSelector,EventLogging'
  - Contest
  - CryoKey
- - DataTransfer
- - DebianISOCodes
- - DebugMode
- - DeleteBatch
- - DeleteOwn
- - Description2
- - DeviceMapLogCapture
- - Diagnosis
  - Dice
- - DidYouKnow
- - DidYouMean
- - DisableAccount
  - Disambiguator:
 dependencies: 'VisualEditor'
- - DiscussionThreading
- - DismissableSiteNotice
- - DisqusTag
  - DjangoAnalytics
  - DonationInterface:
 dependencies: 'ContributionTracking'
- - DoubleWiki
- - DownloadCounter
- - DPLforum
- - Drafts
- - DumpHTML
- - Duplicator
- - DynamicPageList
- - DynamicSidebar
- - E3Experiments
  - Echo
- - EditAccount
- - Editcount
  - EditPageTracking
- - EditSubpages
  - EducationProgram:
 dependencies: 'cldr'
- - Elastica
- - EmailCapture
- - EnhanceContactForm
- - ErrorHandler
  - EtherEditor
- - EtherpadLite
  - EventLogging
  - examples
- - ExpandTemplates
- - ExtensionDistributor
- - ExternalArticles
- - ExternalData
- - ExtraLanguageLink
  - ExtTab
  - FanBoxes
  - FeaturedFeeds
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e55045c..e0946cb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3316,17 +3316,17 @@
   - name: mediawiki/extensions/DebugMode
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DeleteBatch
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DisableAccount
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Disambiguator
 template:
@@ -3336,12 +3336,12 @@
   - name: mediawiki/extensions/DiscussionThreading
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DismissableSiteNotice
 template:
   - name: extension-jslint
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DonationInterface
 template:
@@ -3352,17 +3352,17 @@
   - name: mediawiki/extensions/DoubleWiki
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Drafts
 template:
   - name: extension-jslint
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DynamicSidebar
 template:
   - name: extension-jslint
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/DumpHTML
 template:
@@ -3381,7 +3381,7 @@
   - name: mediawiki/extensions/E3Experiments
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Echo
 template:
@@ -3394,12 +3394,12 @@
   - name: mediawiki/extensions/EditAccount
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Editcount
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/EditPageTracking
 template:
@@ -3414,12 +3414,12 @@
   - name: mediawiki/extensions/Elastica
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/EmailCapture
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/EtherEditor
 template:
@@ -3444,12 +3444,12 @@
   - name: mediawiki/extensions/ExpandTemplates
 template:
   - name: lint-js
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/ExtensionDistributor
 template:
   - name: lint-js
-  - nam

[MediaWiki-commits] [Gerrit] Do not pass null to Title::newFromText in Special:MyLanguage - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Do not pass null to Title::newFromText in Special:MyLanguage
..


Do not pass null to Title::newFromText in Special:MyLanguage

This currently breaks phpunit integration test in Translate.

Change-Id: Ibdc04e9e20c0264076d7a8766ac9a4826033371e
---
M includes/specials/SpecialMyLanguage.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialMyLanguage.php 
b/includes/specials/SpecialMyLanguage.php
index 6cea158..fce1cdc 100644
--- a/includes/specials/SpecialMyLanguage.php
+++ b/includes/specials/SpecialMyLanguage.php
@@ -63,6 +63,7 @@
 * @return Title|null
 */
public function findTitle( $par ) {
+   $par = (string)$par;
// base = title without language code suffix
// provided = the title as it was given
$base = $provided = Title::newFromText( $par );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdc04e9e20c0264076d7a8766ac9a4826033371e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
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] Enable CirrusSearch event logging in labs - change (operations/mediawiki-config)

2015-04-08 Thread Bmansurov (Code Review) 
Bmansurov has uploaded a new change for review.

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

Change subject: Enable CirrusSearch event logging in labs
..

Enable CirrusSearch event logging in labs

Change-Id: If02a009b0734965539c892d0f5edaf92cd9c9d88
---
M wmf-config/CirrusSearch-labs.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php
index 294a002..5ebe4aa 100644
--- a/wmf-config/CirrusSearch-labs.php
+++ b/wmf-config/CirrusSearch-labs.php
@@ -33,3 +33,5 @@
'phrase' => array(
)
 );
+
+$wgCirrusSearchEnableSearchLogging = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If02a009b0734965539c892d0f5edaf92cd9c9d88
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] T86663 4.3: pool 3044; depool 3017,3013,amssq4[78] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.3: pool 3044; depool 3017,3013,amssq4[78]
..


T86663 4.3: pool 3044; depool 3017,3013,amssq4[78]

Change-Id: I94e8f77ecb7f77a7be97dc787954ded7f7e2e1f4
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2a43165..2233618 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,8 +76,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq47.esams.wmnet',
-'amssq48.esams.wmnet',
 'amssq49.esams.wmnet',
 'amssq50.esams.wmnet',
 'amssq51.esams.wmnet',
@@ -150,7 +148,7 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3017.esams.wmnet',
+# 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
@@ -158,6 +156,7 @@
 'cp3035.esams.wmnet',
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
+'cp3044.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4005.ulsfo.wmnet',
@@ -176,7 +175,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3013.esams.wmnet',
+# 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94e8f77ecb7f77a7be97dc787954ded7f7e2e1f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.3: pool 3044; depool 3017,3013,amssq4[78] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.3: pool 3044; depool 3017,3013,amssq4[78]
..

T86663 4.3: pool 3044; depool 3017,3013,amssq4[78]

Change-Id: I94e8f77ecb7f77a7be97dc787954ded7f7e2e1f4
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/202964/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 2a43165..2233618 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,8 +76,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq47.esams.wmnet',
-'amssq48.esams.wmnet',
 'amssq49.esams.wmnet',
 'amssq50.esams.wmnet',
 'amssq51.esams.wmnet',
@@ -150,7 +148,7 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3017.esams.wmnet',
+# 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
@@ -158,6 +156,7 @@
 'cp3035.esams.wmnet',
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
+'cp3044.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4005.ulsfo.wmnet',
@@ -176,7 +175,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3013.esams.wmnet',
+# 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] update.php: Correctly report durations >= 1 hour - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: update.php: Correctly report durations >= 1 hour
..


update.php: Correctly report durations >= 1 hour

Bug: T67772
Change-Id: I61492a1ad8bf7f574b198af82799b030221bb58b
---
M maintenance/update.php
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/update.php b/maintenance/update.php
index 6e93011..0fd1fd8 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -161,7 +161,7 @@
wfCountDown( 5 );
}
 
-   $time1 = new MWTimestamp();
+   $time1 = microtime( true );
 
$shared = $this->hasOption( 'doshared' );
 
@@ -197,9 +197,10 @@
$updater->purgeCache();
}
 
-   $time2 = new MWTimestamp();
-   $timeDiff = $time2->diff( $time1 );
-   $this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . 
".\n" );
+   $time2 = microtime( true );
+
+   $timeDiff = $wgLang->formatTimePeriod( $time2 - $time1 );
+   $this->output( "\nDone in $timeDiff.\n" );
}
 
function afterFinalSetup() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61492a1ad8bf7f574b198af82799b030221bb58b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: PleaseStand 
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 somevalue use bnode - change (mediawiki...Wikibase)

2015-04-08 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review.

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

Change subject: Make somevalue use bnode
..

Make somevalue use bnode

Change-Id: Idcb7c72495b45289a3d062148dbc71d632f3b916
---
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/data/rdf/Q4_all_statements.nt
M repo/tests/phpunit/data/rdf/Q4_claims.nt
M repo/tests/phpunit/data/rdf/Q4_props.nt
M repo/tests/phpunit/data/rdf/Q4_resolved.nt
M repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt
M repo/tests/phpunit/data/rdf/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
M repo/tests/phpunit/data/rdf/Q7_references.nt
M repo/tests/phpunit/data/rdf/Q7_refs.nt
M repo/tests/phpunit/data/rdf/dump_refs.nt
13 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/63/202963/1

diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index 3baca47..b4adbb4 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -650,7 +650,7 @@
case 'somevalue':
$propertyValueLName = $this->getEntityLName( 
$propertyId );
 
-   $writer->say( $propertyNamespace, 
$propertyValueLName )->is( self::NS_ONTOLOGY, 'Somevalue' );
+   $writer->say( $propertyNamespace, 
$propertyValueLName )->is( '_', $writer->blank() );
break;
case 'novalue':
$propertyValueLName = $this->getEntityLName( 
$propertyId );
diff --git a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt 
b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
index 86e1e8c..68aba64 100644
--- a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
+++ b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
@@ -30,7 +30,7 @@
 

  
 .
 

  
 .
 

  
 .
-
   
.
+
  _:genid1 .
 

  
 .
 

  
 .
 

  
 .
diff --git a/repo/tests/phpunit/data/rdf/Q4_claims.nt 
b/repo/tests/phpunit/data/rdf/Q4_claims.nt
index 2aca3c4..ebd77b6 100644
--- a/repo/tests/phpunit/data/rdf/Q4_claims.nt
+++ b/repo/tests/phpunit/data/rdf/Q4_claims.nt
@@ -15,7 +15,7 @@
   
 .
   "Point(12.345 
67.89)"^^ .
   
"\u043F\u0440\u0435\u0432\u0435\u0434"@ru .
-  
 .
+  _:genid1 .
   
"+19.768682121026329696178436279296875"^^
 .
   "simplestring" .
   
"-0200-01-01T00:00:00Z"^^ .
@@ -41,7 +41,7 @@
 

  
 .
 

  
 .

[MediaWiki-commits] [Gerrit] Fix unstaging issue - change (mediawiki...DonationInterface)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix unstaging issue
..


Fix unstaging issue

We can copy the newly unstaged data into the normalized DonationData,
but we should not also merge the other staged data.

Bug: T94506
Change-Id: I5c7c528e9a5183ac3451a2ff81a04fb97a91be1e
---
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M tests/Adapter/GlobalCollect/GlobalCollectTest.php
3 files changed, 36 insertions(+), 5 deletions(-)

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



diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 7da1270..1376733 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -603,7 +603,14 @@
 
$this->unstageData();
 
-   $this->dataObj->addData( $this->unstaged_data );
+   // Only copy the affected values back into the normalized data.
+   $newlyUnstagedData = array();
+   foreach ( $dataArray as $key => $stagedValue ) {
+   if ( array_key_exists( $key, $this->unstaged_data ) ) {
+   $newlyUnstagedData[$key] = 
$this->unstaged_data[$key];
+   }
+   }
+   $this->dataObj->addData( $newlyUnstagedData );
}
 
/**
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index 4b18945..ec55261 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1158,6 +1158,7 @@
'CVVRESULT' => 'cvv_result',
'AVSRESULT' => 'avs_result',
);
+   // FIXME: Refactor as normal unstaging.
$qsResults = array();
foreach ( $pull_vars as $theirkey => $ourkey) {
$tmp = $wgRequest->getVal( $theirkey, null );
@@ -1205,6 +1206,7 @@
// live users get antifraud hooks run in this 
txn's pre-process
$ran_hooks = true;
}
+   // FIXME: Refactor as normal unstaging.
$xmlResults = array(
'cvv_result' => '',
'avs_result' => ''
@@ -1330,6 +1332,7 @@
//confirm or cancel the payment based on $cancelflag
if ( !$problemflag ){
if ( isset( $status_result['data'] ) && is_array( 
$status_result['data'] ) ){
+   // FIXME: Refactor as normal unstaging.
//if they're set, get CVVRESULT && AVSRESULT
$pull_vars['EFFORTID'] = 'effort_id';
$pull_vars['ATTEMPTID'] = 'attempt_id';
@@ -2428,5 +2431,4 @@
return false;
}
}
-
 }
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectTest.php 
b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
index 4cb8953..d0d4159 100644
--- a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
+++ b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
@@ -325,7 +325,7 @@
$this->assertEquals( $gateway->_getData_Staged( 'language' ), 
'no', "'NO' donor's language was inproperly set. Should be 'no'" );
}
 
-   public function testLanguageFallback() {
+   public function testLanguageFallbackStaging() {
$options = $this->getDonorTestData( 'Catalonia' );
$options['payment_method'] = 'cc';
$options['payment_submethod'] = 'visa';
@@ -335,9 +335,31 @@
 
// Requesting the fallback language from the gateway.
$this->assertEquals( 'en', $gateway->_getData_Staged( 
'language' ) );
+   }
 
-   // Preferred language is not damaged by side effects.
-   $this->assertEquals( 'ca', $gateway->getData_Unstaged_Escaped( 
'language' ) );
+   /**
+* Make sure unstaging functions don't overwrite core donor data.
+*/
+   public function testAddResponseData_underzealous() {
+   $options = $this->getDonorTestData( 'Catalonia' );
+   $options['payment_method'] = 'cc';
+   $options['payment_submethod'] = 'visa';
+   $gateway = $this->getFreshGatewayObject( $options );
+
+   // This will set staged_data['language'] = 'en'.
+   $gateway->_stageData();
+
+   $ctid = mt_rand();
+
+   $gateway->addResponseData( array(
+   'contribution_tracking_id' => $ctid . '.1',
+   ) );
+
+   // Desired vars were written into normalized data.
+   $this->

[MediaWiki-commits] [Gerrit] T86663 4.2: repool cp301[26] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.2: repool cp301[26]
..


T86663 4.2: repool cp301[26]

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

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index c89ffa5..2a43165 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,7 +71,7 @@
 ],
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
-# 'cp3012.esams.wmnet',
+'cp3012.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -179,7 +179,7 @@
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
-# 'cp3016.esams.wmnet',
+'cp3016.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If99814d5f6ade9662d5604be36a834eca1450a1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.2: repool cp301[26] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.2: repool cp301[26]
..

T86663 4.2: repool cp301[26]

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/202962/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index c89ffa5..2a43165 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,7 +71,7 @@
 ],
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
-# 'cp3012.esams.wmnet',
+'cp3012.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -179,7 +179,7 @@
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
-# 'cp3016.esams.wmnet',
+'cp3016.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] T86663 4.2: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.2: shuffle roles, no repool yet
..


T86663 4.2: shuffle roles, no repool yet

Change-Id: I42722f191a4c1d51903cbfde82779bf8460a72ec
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e977a1f..c89ffa5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,6 +71,7 @@
 ],
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
+# 'cp3012.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -149,7 +150,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
@@ -176,10 +176,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
+# 'cp3016.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 68878e6..a8b94aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp3011\.esams\.wmnet$/ {
+node /^cp301[12]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|1[6-8])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[2345]\.esams\.wmnet$/ {
+node /^cp301[3456]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

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

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

[MediaWiki-commits] [Gerrit] T86663 4.2: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.2: shuffle roles, no repool yet
..

T86663 4.2: shuffle roles, no repool yet

Change-Id: I42722f191a4c1d51903cbfde82779bf8460a72ec
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/202961/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e977a1f..c89ffa5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,6 +71,7 @@
 ],
 'esams' => [
 # T92306 'cp3011.esams.wmnet', # needs-jessie-install
+# 'cp3012.esams.wmnet',
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -149,7 +150,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
@@ -176,10 +176,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',
+# 'cp3016.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 68878e6..a8b94aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
 role cache::bits
 }
 
-node /^cp3011\.esams\.wmnet$/ {
+node /^cp301[12]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::text
 }
 
-node /^cp30(0[3-9]|10|1[6-8])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -445,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[2345]\.esams\.wmnet$/ {
+node /^cp301[3456]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

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

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

[MediaWiki-commits] [Gerrit] Normalize DOM before running DOM-Diff. - change (mediawiki...parsoid)

2015-04-08 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review.

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

Change subject: Normalize DOM before running DOM-Diff.
..

Normalize DOM before running DOM-Diff.

* It makes sense to normalize the edited DOM before
  running a DOMDiff on it. This should effectively
  only normalize new content since we shouldn't have
  enabled normalizations that might affect existing
  content (at least true for wikis that have wikitext
  norms about acceptable wikitext).

Change-Id: I6f02e2b5bee900b8cee8001c499721e02d89a5a0
---
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
M lib/wts.normalizeDOM.js
M tests/parserTests-blacklist.js
4 files changed, 18 insertions(+), 17 deletions(-)


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

diff --git a/lib/mediawiki.SelectiveSerializer.js 
b/lib/mediawiki.SelectiveSerializer.js
index 9ed0477..8a81cd9 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -13,6 +13,7 @@
ParserPipelineFactory = 
require('./mediawiki.parser.js').ParserPipelineFactory,
DOMDiff = require('./mediawiki.DOMDiff.js').DOMDiff,
ParsoidCacheRequest = 
require('./mediawiki.ApiRequest.js').ParsoidCacheRequest,
+   normalizeDOM = require('./wts.normalizeDOM.js').normalizeDOM,
async = require('async');
 
 /**
@@ -68,6 +69,9 @@
this.timer.timing( 'html2wt.full.serialize', '', ( 
Date.now() - startTimers.get( 'html2wt.full.serialize' )) );
}
} else {
+   // Normalize DOM before diffing
+   normalizeDOM(body, this.env);
+
// Use provided diff-marked DOM (used during testing)
// or generate one (used in production)
if ( this.timer ) {
diff --git a/lib/mediawiki.WikitextSerializer.js 
b/lib/mediawiki.WikitextSerializer.js
index 5458fb5..6c025cf 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -22,7 +22,7 @@
  *   wikitext and HTML serialization.
  * -- */
 
-"use strict";
+'use strict';
 
 require('./core-upgrade.js');
 var wtConsts = require('./mediawiki.wikitext.constants.js'),
@@ -1374,8 +1374,10 @@
}
var state = new SerializerState(this, this.options);
try {
-   // Normalize the DOM
-   normalizeDOM(body, state.env);
+   if (!selserMode) {
+   // Normalize the DOM
+   normalizeDOM(body, state.env);
+   }
 
// Don't serialize the DOM if debugging is disabled
this.env.log(this.logType, function() {
diff --git a/lib/wts.normalizeDOM.js b/lib/wts.normalizeDOM.js
index 1a2e2ff..d9fb752 100644
--- a/lib/wts.normalizeDOM.js
+++ b/lib/wts.normalizeDOM.js
@@ -26,17 +26,15 @@
  * For example: a='x' b='y' => 'xy'
  */
 function swappable(a, b) {
-   return DU.numNonDeletedChildNodes(a) === 1 &&
-   similar(a, DU.firstNonDeletedChildNode(a)) &&
-   mergable(DU.firstNonDeletedChildNode(a), b);
+   return a.childNodes.length === 1 &&
+   similar(a, a.firstChild) &&
+   mergable(a.firstChild, b);
 }
 
 /** Transfer all of b's children to a and delete b */
 function merge(env, a, b) {
DU.migrateChildren(b, a);
b.parentNode.removeChild(b);
-
-   DU.setDiffMark(a, env, 'children-changed');
return a;
 }
 
@@ -45,9 +43,6 @@
DU.migrateChildren(b, a);
a.parentNode.insertBefore(b, a);
b.appendChild(a);
-
-   DU.setDiffMark(a, env, 'children-changed');
-   DU.setDiffMark(b, env, 'children-changed');
 
return b;
 }
@@ -115,12 +110,12 @@
// so we don't need to recurse further.
_normalizeDOM(env, a, false);
} else if (swappable(a, b)) {
-   a = merge(env, swap(env, a, 
DU.firstNonDeletedChildNode(a)), b);
+   a = merge(env, swap(env, a, a.firstChild), b);
// Again, a has new children, but the grandkids have 
already
// been minimized.
_normalizeDOM(env, a, false);
} else if (swappable(b, a)) {
-   a = merge(env, a, swap(env, b, 
DU.firstNonDeletedChildNode(b)));
+   a = merge(env, a, swap(env, b, b.firstChild));
// Again, a has new children, but the grandkids have 
already
// been minimized.
_normalizeDOM(env, a, false);
@@ -166,11 +161,11 @@
 
 _normalizeDOM = function(env, node, recurse) {
// Process the first child outside the loop.
-   var a = DU.firstNonDeletedChildNode(node);
+

[MediaWiki-commits] [Gerrit] T86663 4.2: pool 3035; depool 3016,3012,amssq4[56] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.2: pool 3035; depool 3016,3012,amssq4[56]
..


T86663 4.2: pool 3035; depool 3016,3012,amssq4[56]

Change-Id: I61329959f33a1b359b19990267df6922d5804078
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6818c8b..e977a1f 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -75,8 +75,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq45.esams.wmnet',
-'amssq46.esams.wmnet',
 'amssq47.esams.wmnet',
 'amssq48.esams.wmnet',
 'amssq49.esams.wmnet',
@@ -151,12 +149,13 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3016.esams.wmnet',
+# 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
+'cp3035.esams.wmnet',
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
 ],
@@ -177,7 +176,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3012.esams.wmnet',
+# 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61329959f33a1b359b19990267df6922d5804078
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.2: pool 3035; depool 3016,3012,amssq4[56] - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.2: pool 3035; depool 3016,3012,amssq4[56]
..

T86663 4.2: pool 3035; depool 3016,3012,amssq4[56]

Change-Id: I61329959f33a1b359b19990267df6922d5804078
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/202959/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6818c8b..e977a1f 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -75,8 +75,6 @@
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
 'cp3041.esams.wmnet',
-'amssq45.esams.wmnet',
-'amssq46.esams.wmnet',
 'amssq47.esams.wmnet',
 'amssq48.esams.wmnet',
 'amssq49.esams.wmnet',
@@ -151,12 +149,13 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-'cp3016.esams.wmnet',
+# 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
 'cp3032.esams.wmnet',
 'cp3033.esams.wmnet',
 'cp3034.esams.wmnet',
+'cp3035.esams.wmnet',
 'cp3042.esams.wmnet',
 'cp3043.esams.wmnet',
 ],
@@ -177,7 +176,7 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-'cp3012.esams.wmnet',
+# 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
 'cp3015.esams.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] Add tests for TableAction#mergeCells - change (VisualEditor/VisualEditor)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add tests for TableAction#mergeCells
..


Add tests for TableAction#mergeCells

Change-Id: I53a60f7ef2dd3a7be78d5013ecf89e091e3415da
---
M tests/ui/actions/ve.ui.TableAction.test.js
1 file changed, 44 insertions(+), 1 deletion(-)

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



diff --git a/tests/ui/actions/ve.ui.TableAction.test.js 
b/tests/ui/actions/ve.ui.TableAction.test.js
index 03f560b..242a323 100644
--- a/tests/ui/actions/ve.ui.TableAction.test.js
+++ b/tests/ui/actions/ve.ui.TableAction.test.js
@@ -25,7 +25,7 @@
surface.destroy();
 }
 
-QUnit.test( 'create / insert', function ( assert ) {
+QUnit.test( 'create / insert / mergeCells', function ( assert ) {
var i,
expected = 0,
tableCellTail = [
@@ -245,6 +245,49 @@
);
},
msg: 'insert row in middle of table'
+   },
+   {
+   html: ve.dm.example.mergedCellsHtml,
+   selection: {
+   type: 'table',
+   tableRange: new ve.Range( 0, 171 ),
+   fromCol: 0,
+   fromRow: 0,
+   toCol: 2,
+   toRow: 1
+   },
+   method: 'mergeCells',
+   args: [],
+   expectedData: function ( data ) {
+   data[3].attributes.colspan = 3;
+   data[3].attributes.rowspan = 2;
+   data.splice( 40, 5 );
+   data.splice( 35, 5 );
+   data.splice( 13, 5 );
+   data.splice( 8, 5 );
+   },
+   msg: 'merge cells'
+   },
+   {
+   html: ve.dm.example.mergedCellsHtml,
+   selection: {
+   type: 'table',
+   tableRange: new ve.Range( 0, 171 ),
+   fromCol: 1,
+   fromRow: 3,
+   toCol: 3,
+   toRow: 5
+   },
+   method: 'mergeCells',
+   args: [],
+   expectedData: function ( data ) {
+   data[90].attributes.colspan = 1;
+   data[90].attributes.rowspan = 1;
+   data.splice.apply( data, [ 124, 0 
].concat( tableData, tableData, tableData ) );
+   data.splice.apply( data, [ 110, 0 
].concat( tableData, tableData, tableData ) );
+   data.splice.apply( data, [ 96, 0 
].concat( tableData, tableData ) );
+   },
+   msg: 'unmerge cells'
}
];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53a60f7ef2dd3a7be78d5013ecf89e091e3415da
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] Make gate-and-submit an independent pipeline - change (integration/config)

2015-04-08 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Make gate-and-submit an independent pipeline
..

Make gate-and-submit an independent pipeline

Due to our movement towards generic jobs, more and more unrelated projects
have been dragged into the "mediawiki" queue, slowing down merges for
everyone.

Upstream is aware of these issues and are looking into them, but
it doesn't appear to be a short solution.

Bug: T94322
Change-Id: I2f7bc843bba8aded6bdaa38d72c6307f9387438f
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/58/202958/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e55045c..305dde8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -412,7 +412,7 @@
   - name: gate-and-submit
 description: >
   Patchsets that have been reviewed. Will be merged by Jenkins if tests 
pass.
-manager: DependentPipelineManager
+manager: IndependentPipelineManager
 precedence: high
 window-floor: 12
 trigger:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f7bc843bba8aded6bdaa38d72c6307f9387438f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] T86663 4.1: repool cp3015 - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.1: repool cp3015
..


T86663 4.1: repool cp3015

Change-Id: I6cd5fd52a9b600d015c2f42bf64f36566d5842c0
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 78121ad..6818c8b 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -180,7 +180,7 @@
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
-# 'cp3015.esams.wmnet',
+'cp3015.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cd5fd52a9b600d015c2f42bf64f36566d5842c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] T86663 4.1: repool cp3015 - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: T86663 4.1: repool cp3015
..

T86663 4.1: repool cp3015

Change-Id: I6cd5fd52a9b600d015c2f42bf64f36566d5842c0
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/202957/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 78121ad..6818c8b 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -180,7 +180,7 @@
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
-# 'cp3015.esams.wmnet',
+'cp3015.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] Bump VisualEditor for I2149c7a710 - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Bump VisualEditor for I2149c7a710
..


Bump VisualEditor for I2149c7a710

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 783dbb6..4debb33 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 783dbb6c13ca8958def0872edfbd6e727fe3afd8
+Subproject commit 4debb333f4f27658c5000bea258fd9a616860950

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b0d9e3dc9a8642230beeb1a870034846dea6d01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
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] Fix documentation in the ve.ui.CiteFromIdReferenceWidget - change (mediawiki...Citoid)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix documentation in the ve.ui.CiteFromIdReferenceWidget
..


Fix documentation in the ve.ui.CiteFromIdReferenceWidget

Make the non-optional transclusionModel a parameter and document
all other configuration options.

Change-Id: I83c8eee0bf25142843a381ab1d99a0871a24a0a7
---
M modules/ve.ui.CiteFromIdInspector.js
M modules/ve.ui.CiteFromIdReferenceWidget.js
2 files changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index f83e255..601c8d9 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -511,9 +511,9 @@
for ( i = 0; i < inspector.results.length; i++ ) {
refWidget = new ve.ui.CiteFromIdReferenceWidget(

inspector.getFragment().getSurface().getDocument(),
+   inspector.results[i].transclusionModel,
{
data: i,
-   transclusionModel: 
inspector.results[i].transclusionModel,
templateName: 
inspector.results[i].templateName,
citeTools: inspector.citeTools
} );
diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js 
b/modules/ve.ui.CiteFromIdReferenceWidget.js
index 683c02c..8ee56c8 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -6,19 +6,20 @@
  *
  * @constructor
  * @param {ve.dm.Document} documentModel Document model
+ * @param {ve.dm.MWTransclusionModel} transclusionModel Transclusion model 
used for this template
  * @param {Object} config Configuration object
  * @cfg {string} [templateName] Template name
- * @cfg {ve.dm.MWTransclusionModel} transclusionModel Transclusion model used 
for this template
+ * @cfg {Object[]} citeTools An array of available citation tool configuration
  */
-ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, config ) {
+ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, transclusionModel, config ) {
var i, len, icon, item, title,
widget = this;
 
config = config || {};
 
-   this.allLinks = {};
+   this.transclusionModel = transclusionModel;
+
this.templateName = config.templateName || 'Cite web';
-   this.transclusionModel = config.transclusionModel;
this.title = this.templateName;
 
this.renderPromise = $.Deferred();
@@ -39,7 +40,7 @@
}
}
}
-   this.setIcon( icon );
+   this.setIcon( icon || 'cite-web' );
 
// Add insert button
this.insertButton = new OO.ui.ButtonWidget( {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83c8eee0bf25142843a381ab1d99a0871a24a0a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
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] Add tests for TableAction#insert - change (VisualEditor/VisualEditor)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add tests for TableAction#insert
..


Add tests for TableAction#insert

Also fix concat style of create tests.

Change-Id: I2f0402a3a6115f039447fe540d828010ef1e761f
---
M tests/ui/actions/ve.ui.TableAction.test.js
1 file changed, 133 insertions(+), 21 deletions(-)

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



diff --git a/tests/ui/actions/ve.ui.TableAction.test.js 
b/tests/ui/actions/ve.ui.TableAction.test.js
index 314d2ca..03f560b 100644
--- a/tests/ui/actions/ve.ui.TableAction.test.js
+++ b/tests/ui/actions/ve.ui.TableAction.test.js
@@ -25,7 +25,7 @@
surface.destroy();
 }
 
-QUnit.test( 'create', function ( assert ) {
+QUnit.test( 'create / insert', function ( assert ) {
var i,
expected = 0,
tableCellTail = [
@@ -71,13 +71,13 @@
{ type: 'table', 
attributes: { sortable: true } },
{ type: 'tableSection', 
attributes: { style: 'body' } },
{ type: 'tableRow' }
-   ]
-   .concat( tableData )
-   .concat( [
+   ],
+   tableData,
+   [
{ type: '/tableRow' },
{ type: '/tableSection' 
},
{ type: '/table' }
-   ] )
+   ]
) );
},
expectedSelection: {
@@ -107,32 +107,144 @@
{ type: 'table' },
{ type: 'tableSection', 
attributes: { style: 'body' } },
{ type: 'tableRow' }
-   ]
-   .concat( tableHeader )
-   .concat( tableHeader )
-   .concat( tableHeader )
-   .concat( [
+   ],
+   tableHeader,
+   tableHeader,
+   tableHeader,
+   [
{ type: '/tableRow' },
{ type: 'tableRow' }
-   ] )
-   .concat( tableData )
-   .concat( tableData )
-   .concat( tableData )
-   .concat( [
+   ],
+   tableData,
+   tableData,
+   tableData,
+   [
{ type: '/tableRow' },
{ type: 'tableRow' }
-   ] )
-   .concat( tableData )
-   .concat( tableData )
-   .concat( tableData )
-   .concat( [
+   ],
+   tableData,
+   tableData,
+   tableData,
+   [
{ type: '/tableRow' },
{ type: '/tableSection' 
},
{ type: '/table' }
-   ] )
+   ]
) );
},
msg: 'create small table with header'
+   },
+

[MediaWiki-commits] [Gerrit] Bump VisualEditor for I2149c7a710 - change (mediawiki/core)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Bump VisualEditor for I2149c7a710
..


Bump VisualEditor for I2149c7a710

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 970a20b..dfbd5d2 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 970a20b6a768df6b17622e2c4ae92fb651353d12
+Subproject commit dfbd5d278b61418104f3d85a2c8040e2480bf784

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3045d8be6fd0568452a15eacf7f20a7f0e0c645
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf24
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] Handle coercion of the empty string in the API - change (mediawiki...parsoid)

2015-04-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Handle coercion of the empty string in the API
..


Handle coercion of the empty string in the API

 * Fixes the error on kowiki/이완구 whose content is the empty string.
   That led to API returning a 302 redirect which the roundtrip-test.js
   doesn't follow but tries to return an error with res.body, which is
   undefined, tricking us into believing there is no err, setting the
   html as null and resending that to API which wasn't expecting it.

Change-Id: I5ea38deea0816f95cd6bfb6e7fbfcbec2c4f319a
---
M api/routes.js
M tests/roundtrip-test.js
2 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/api/routes.js b/api/routes.js
index 1016c36..d411066 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -503,7 +503,7 @@
}
 
var p;
-   if ( wt && (!res.local('pageName') || !oldid) ) {
+   if ( typeof wt === 'string' && (!res.local('pageName') || !oldid) ) {
// don't fetch the page source
env.setPageSrcInfo( wt );
p = Promise.resolve();
@@ -511,7 +511,7 @@
p = promiseTemplateReq( env, target, oldid );
}
 
-   if ( wt ) {
+   if ( typeof wt === 'string' ) {
p = p.then( parseWt )
.timeout( REQ_TIMEOUT )
.then(sendRes);
@@ -833,7 +833,7 @@
// Accept wikitext as a string or object{body,headers}
var wikitext = (v2.wikitext && typeof v2.wikitext !== "string") 
?
v2.wikitext.body : v2.wikitext;
-   if ( !wikitext ) {
+   if ( typeof wikitext !== "string" ) {
if ( !res.local('pageName') ) {
return errOut( "No title or wikitext was 
provided.", 400 );
}
@@ -849,7 +849,8 @@
return errOut( "No html was supplied.", 400 );
}
// Accept html as a string or object{body,headers}
-   var html = (typeof v2.html === "string") ? v2.html : 
v2.html.body;
+   var html = (typeof v2.html === "string") ?
+   v2.html : (v2.html.body || "");
html2wt( req, res, html );
}
 };
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index 7d010a6..d5d1a53 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -482,7 +482,8 @@
if (err) {
cb( err, null );
} else if (res.statusCode !== 200) {
-   cb(res.body, null);
+   err = new Error('Got status code: ' + res.statusCode);
+   cb(err, null);
} else {
var resBody, resDP;
if (oldid) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ea38deea0816f95cd6bfb6e7fbfcbec2c4f319a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: 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] Fix documentation in the ve.ui.CiteFromIdReferenceWidget - change (mediawiki...Citoid)

2015-04-08 Thread Mooeypoo (Code Review) 
Mooeypoo has uploaded a new change for review.

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

Change subject: Fix documentation in the ve.ui.CiteFromIdReferenceWidget
..

Fix documentation in the ve.ui.CiteFromIdReferenceWidget

Make the non-optional transclusionModel a parameter and document
all other configuration options.

Change-Id: I83c8eee0bf25142843a381ab1d99a0871a24a0a7
---
M modules/ve.ui.CiteFromIdInspector.js
M modules/ve.ui.CiteFromIdReferenceWidget.js
2 files changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/56/202956/1

diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index f83e255..601c8d9 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -511,9 +511,9 @@
for ( i = 0; i < inspector.results.length; i++ ) {
refWidget = new ve.ui.CiteFromIdReferenceWidget(

inspector.getFragment().getSurface().getDocument(),
+   inspector.results[i].transclusionModel,
{
data: i,
-   transclusionModel: 
inspector.results[i].transclusionModel,
templateName: 
inspector.results[i].templateName,
citeTools: inspector.citeTools
} );
diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js 
b/modules/ve.ui.CiteFromIdReferenceWidget.js
index 683c02c..8ee56c8 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -6,19 +6,20 @@
  *
  * @constructor
  * @param {ve.dm.Document} documentModel Document model
+ * @param {ve.dm.MWTransclusionModel} transclusionModel Transclusion model 
used for this template
  * @param {Object} config Configuration object
  * @cfg {string} [templateName] Template name
- * @cfg {ve.dm.MWTransclusionModel} transclusionModel Transclusion model used 
for this template
+ * @cfg {Object[]} citeTools An array of available citation tool configuration
  */
-ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, config ) {
+ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, transclusionModel, config ) {
var i, len, icon, item, title,
widget = this;
 
config = config || {};
 
-   this.allLinks = {};
+   this.transclusionModel = transclusionModel;
+
this.templateName = config.templateName || 'Cite web';
-   this.transclusionModel = config.transclusionModel;
this.title = this.templateName;
 
this.renderPromise = $.Deferred();
@@ -39,7 +40,7 @@
}
}
}
-   this.setIcon( icon );
+   this.setIcon( icon || 'cite-web' );
 
// Add insert button
this.insertButton = new OO.ui.ButtonWidget( {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83c8eee0bf25142843a381ab1d99a0871a24a0a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] rrd-navtiming: fix logging - change (operations/puppet)

2015-04-08 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: rrd-navtiming: fix logging
..


rrd-navtiming: fix logging

Change-Id: Id8fad042dff48e08d8ce6e16a47e708b25af8e76
---
M modules/webperf/files/rrd-navtiming
1 file changed, 28 insertions(+), 23 deletions(-)

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



diff --git a/modules/webperf/files/rrd-navtiming 
b/modules/webperf/files/rrd-navtiming
index 766e7b4..67ce91b 100755
--- a/modules/webperf/files/rrd-navtiming
+++ b/modules/webperf/files/rrd-navtiming
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
   rrd-navtiming
@@ -65,6 +65,8 @@
   limitations under the License.
 
 """
+from __future__ import division
+
 import sys
 reload(sys)
 sys.setdefaultencoding('utf-8')
@@ -90,33 +92,32 @@
 ap.add_argument(
 '--rrd-path',
 help='Path to use for RRD storage (default: CWD)',
-default=os.getcwd()
+default=os.getcwd(),
+type=os.path.abspath
 )
 ap.add_argument(
 '--log-path',
 help='Path to use for log files (default: log to stderr only).',
+type=os.path.abspath
 )
 args = ap.parse_args()
 
-log = logging.getLogger(__name__)
-formatter = logging.Formatter('%(asctime)s [%(funcName)s] %(message)s')
-log.setLevel(logging.INFO)
-
-stderr_handler = logging.StreamHandler(stream=sys.stderr)
-stderr_handler.setFormatter(formatter)
-log.addHandler(stderr_handler)
-
+# Setup logging
+log_handlers = [logging.StreamHandler(stream=sys.stderr)]
 if args.log_path:
-# If the --log-path option was set, log to a file as well.
-# The file is rotated when its size exceeds 50 MB.
-# 10 archives are retained.
-assert os.path.isdir(args.log_path)
-log_file = os.path.join(args.log_path, 'rrd-navtiming.log')
-file_handler = logging.handlers.RotatingFileHandler(
-log_file, maxBytes=5e7, backupCount=10)
-file_handler.setFormatter(formatter)
-log.addHandler(file_handler)
+log_handlers.append(logging.handlers.RotatingFileHandler(
+os.path.join(args.log_path, 'rrd-navtiming.log'), backupCount=10,
+maxBytes=(50 * 1000 * 1000)))  # Rotate when >50MB; retain 10 archives
 
+log = logging.getLogger('rrd-navtiming')
+formatter = logging.Formatter('[%(asctime)s] %(message)s')
+log.setLevel(logging.INFO)
+for log_handler in log_handlers:
+log_handler.setFormatter(formatter)
+log_handler.setLevel(logging.INFO)
+log.addHandler(log_handler)
+
+log.info('Starting up...')
 
 # Lock for operations that access shared dynamic data (the `heap` list).
 # We could probably get by without locks, because only the main thread
@@ -158,6 +159,10 @@
 # We will push an aggregate value as often as we need in order to have
 # ROWS many values at the smallest INTERVAL.
 STEP = INTERVALS[0] / ROWS
+
+# STEP should be a whole number that divides each INTERVAL.
+assert STEP.is_integer()
+assert all((interval / STEP).is_integer() for interval in INTERVALS)
 
 # Set the maximum acceptable interval between samples ("heartbeat") to a
 # full day. This means RRD will record an estimate for missing samples as
@@ -204,7 +209,7 @@
 rrd_file = os.path.join(path, platform + '.rrd')
 # We have to output values in the order we declared them.
 update = 'N:' + ':'.join(str(samples[m]) for m in METRICS)
-logging.info('%s: %s', rrd_file, update)
+log.info('%s: %s', rrd_file, update)
 rrdtool.update(rrd_file, update)
 
 
@@ -235,7 +240,7 @@
 try:
 data[platform][metric] = median(values)
 except ValueError:
-logging.warning('No values for %s on %s', metric, platform)
+log.warning('No values for %s on %s', metric, platform)
 raise
 return data
 
@@ -256,11 +261,11 @@
 if not e.message.endswith('File exists'):
 raise
 else:
-logging.info('Created %s', rrd_file)
+log.info('Created %s', rrd_file)
 
 
 create_rrds(args.rrd_path)
-logging.info('Connecting to %s...', args.endpoint)
+log.info('Connecting to <%s>...', args.endpoint)
 events = eventlogging.connect(args.endpoint)
 
 worker = eventlogging.PeriodicThread(interval=STEP, target=update_rrds,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8fad042dff48e08d8ce6e16a47e708b25af8e76
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] rrd-navtiming: fix logging - change (operations/puppet)

2015-04-08 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: rrd-navtiming: fix logging
..

rrd-navtiming: fix logging

Change-Id: Id8fad042dff48e08d8ce6e16a47e708b25af8e76
---
M modules/webperf/files/rrd-navtiming
1 file changed, 28 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/202955/1

diff --git a/modules/webperf/files/rrd-navtiming 
b/modules/webperf/files/rrd-navtiming
index 766e7b4..67ce91b 100755
--- a/modules/webperf/files/rrd-navtiming
+++ b/modules/webperf/files/rrd-navtiming
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
   rrd-navtiming
@@ -65,6 +65,8 @@
   limitations under the License.
 
 """
+from __future__ import division
+
 import sys
 reload(sys)
 sys.setdefaultencoding('utf-8')
@@ -90,33 +92,32 @@
 ap.add_argument(
 '--rrd-path',
 help='Path to use for RRD storage (default: CWD)',
-default=os.getcwd()
+default=os.getcwd(),
+type=os.path.abspath
 )
 ap.add_argument(
 '--log-path',
 help='Path to use for log files (default: log to stderr only).',
+type=os.path.abspath
 )
 args = ap.parse_args()
 
-log = logging.getLogger(__name__)
-formatter = logging.Formatter('%(asctime)s [%(funcName)s] %(message)s')
-log.setLevel(logging.INFO)
-
-stderr_handler = logging.StreamHandler(stream=sys.stderr)
-stderr_handler.setFormatter(formatter)
-log.addHandler(stderr_handler)
-
+# Setup logging
+log_handlers = [logging.StreamHandler(stream=sys.stderr)]
 if args.log_path:
-# If the --log-path option was set, log to a file as well.
-# The file is rotated when its size exceeds 50 MB.
-# 10 archives are retained.
-assert os.path.isdir(args.log_path)
-log_file = os.path.join(args.log_path, 'rrd-navtiming.log')
-file_handler = logging.handlers.RotatingFileHandler(
-log_file, maxBytes=5e7, backupCount=10)
-file_handler.setFormatter(formatter)
-log.addHandler(file_handler)
+log_handlers.append(logging.handlers.RotatingFileHandler(
+os.path.join(args.log_path, 'rrd-navtiming.log'), backupCount=10,
+maxBytes=(50 * 1000 * 1000)))  # Rotate when >50MB; retain 10 archives
 
+log = logging.getLogger('rrd-navtiming')
+formatter = logging.Formatter('[%(asctime)s] %(message)s')
+log.setLevel(logging.INFO)
+for log_handler in log_handlers:
+log_handler.setFormatter(formatter)
+log_handler.setLevel(logging.INFO)
+log.addHandler(log_handler)
+
+log.info('Starting up...')
 
 # Lock for operations that access shared dynamic data (the `heap` list).
 # We could probably get by without locks, because only the main thread
@@ -158,6 +159,10 @@
 # We will push an aggregate value as often as we need in order to have
 # ROWS many values at the smallest INTERVAL.
 STEP = INTERVALS[0] / ROWS
+
+# STEP should be a whole number that divides each INTERVAL.
+assert STEP.is_integer()
+assert all((interval / STEP).is_integer() for interval in INTERVALS)
 
 # Set the maximum acceptable interval between samples ("heartbeat") to a
 # full day. This means RRD will record an estimate for missing samples as
@@ -204,7 +209,7 @@
 rrd_file = os.path.join(path, platform + '.rrd')
 # We have to output values in the order we declared them.
 update = 'N:' + ':'.join(str(samples[m]) for m in METRICS)
-logging.info('%s: %s', rrd_file, update)
+log.info('%s: %s', rrd_file, update)
 rrdtool.update(rrd_file, update)
 
 
@@ -235,7 +240,7 @@
 try:
 data[platform][metric] = median(values)
 except ValueError:
-logging.warning('No values for %s on %s', metric, platform)
+log.warning('No values for %s on %s', metric, platform)
 raise
 return data
 
@@ -256,11 +261,11 @@
 if not e.message.endswith('File exists'):
 raise
 else:
-logging.info('Created %s', rrd_file)
+log.info('Created %s', rrd_file)
 
 
 create_rrds(args.rrd_path)
-logging.info('Connecting to %s...', args.endpoint)
+log.info('Connecting to <%s>...', args.endpoint)
 events = eventlogging.connect(args.endpoint)
 
 worker = eventlogging.PeriodicThread(interval=STEP, target=update_rrds,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8fad042dff48e08d8ce6e16a47e708b25af8e76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Bump VisualEditor for I2149c7a710 - change (mediawiki/core)

2015-04-08 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Bump VisualEditor for I2149c7a710
..

Bump VisualEditor for I2149c7a710

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/202954/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 783dbb6..4debb33 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 783dbb6c13ca8958def0872edfbd6e727fe3afd8
+Subproject commit 4debb333f4f27658c5000bea258fd9a616860950

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0d9e3dc9a8642230beeb1a870034846dea6d01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf1
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Bump VisualEditor for I2149c7a710 - change (mediawiki/core)

2015-04-08 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review.

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

Change subject: Bump VisualEditor for I2149c7a710
..

Bump VisualEditor for I2149c7a710

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/202953/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 970a20b..dfbd5d2 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 970a20b6a768df6b17622e2c4ae92fb651353d12
+Subproject commit dfbd5d278b61418104f3d85a2c8040e2480bf784

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

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

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

[MediaWiki-commits] [Gerrit] set cassandra vars in cassandra.yaml, not restbase - change (operations/puppet)

2015-04-08 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: set cassandra vars in cassandra.yaml, not restbase
..


set cassandra vars in cassandra.yaml, not restbase

set cassandra variables in cassandra.yaml, not in restbase.yaml
they just happen to be on the same boxes for now

Change-Id: Ied81257fff06789e9ab206d88273154802881732
---
M hieradata/role/common/cassandra.yaml
M hieradata/role/common/restbase.yaml
2 files changed, 19 insertions(+), 18 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  GWicke: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 65efa17..2ae48e2 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -1,2 +1,21 @@
 cassandra::metrics::graphite_host: 'graphite-in.eqiad.wmnet'
 cassandra::start_rpc: 'false'
+
+# TODO: set up a cluster variable similar to MySQL clusters to share
+# cassandra cluster configs between cassandra & clients
+
+cassandra::seeds:
+- restbase1001.eqiad.wmnet
+- restbase1002.eqiad.wmnet
+- restbase1003.eqiad.wmnet
+- restbase1004.eqiad.wmnet
+- restbase1005.eqiad.wmnet
+- restbase1006.eqiad.wmnet
+cassandra::max_heap_size: 8g
+cassandra::heap_newsize: 1200m
+cassandra::compaction_throughput_mb_per_sec: 160
+cassandra::concurrent_compactors: 10
+
+cassandra::dc: "%{::site}"
+cassandra::cluster_name: "%{::site}"
+
diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 687a714..4d8fa1e 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -1,18 +1,3 @@
-# TODO: set up a cluster variable similar to MySQL clusters to share
-# cassandra cluster configs between cassandra & clients
-
-cassandra::seeds:
-- restbase1001.eqiad.wmnet
-- restbase1002.eqiad.wmnet
-- restbase1003.eqiad.wmnet
-- restbase1004.eqiad.wmnet
-- restbase1005.eqiad.wmnet
-- restbase1006.eqiad.wmnet
-cassandra::max_heap_size: 8g
-cassandra::heap_newsize: 1200m
-cassandra::compaction_throughput_mb_per_sec: 160
-cassandra::concurrent_compactors: 10
-
 #
 # RESTBase
 #
@@ -31,9 +16,6 @@
 
 lvs::realserver::realserver_ips:
   - '10.2.2.17' # restbase.svc.eqiad.wmnet
-
-cassandra::dc: "%{::site}"
-cassandra::cluster_name: "%{::site}"
 
 admin::groups:
   - restbase-roots

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied81257fff06789e9ab206d88273154802881732
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] T86663 4.1: shuffle roles, no repool yet - change (operations/puppet)

2015-04-08 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: T86663 4.1: shuffle roles, no repool yet
..


T86663 4.1: shuffle roles, no repool yet

Change-Id: I7cf024be089974efe3d21d4f3bbe9f306b8dc243
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 9ebed19..78121ad 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -70,6 +70,7 @@
 'cp1068.eqiad.wmnet',
 ],
 'esams' => [
+# T92306 'cp3011.esams.wmnet', # needs-jessie-install
 'cp3030.esams.wmnet',
 'cp3031.esams.wmnet',
 'cp3040.esams.wmnet',
@@ -150,7 +151,6 @@
 'cp3008.esams.wmnet',
 'cp3009.esams.wmnet',
 'cp3010.esams.wmnet',
-# 'cp3015.esams.wmnet',
 'cp3016.esams.wmnet',
 'cp3017.esams.wmnet',
 'cp3018.esams.wmnet',
@@ -177,10 +177,10 @@
 'cp1060.eqiad.wmnet',
 ],
 'esams' => [
-# T92306 'cp3011.esams.wmnet', # 
needs-jessie-install
 'cp3012.esams.wmnet',
 'cp3013.esams.wmnet',
 'cp3014.esams.wmnet',
+# 'cp3015.esams.wmnet',
 ],
 'ulsfo' => [
 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index c372d50..68878e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,7 +430,12 @@
 role cache::bits
 }
 
-node /^cp30(0[3-9]|10|1[5-8])\.esams\.wmnet$/ {
+node /^cp3011\.esams\.wmnet$/ {
+interface::add_ip6_mapped { 'main': }
+role cache::text
+}
+
+node /^cp30(0[3-9]|10|1[6-8])\.esams\.wmnet$/ {
 if $::hostname =~ /^cp300[34]$/ {
 $ganglia_aggregator = true
 }
@@ -440,7 +445,7 @@
 role cache::upload
 }
 
-node /^cp301[1234]\.esams\.wmnet$/ {
+node /^cp301[2345]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::mobile
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cf024be089974efe3d21d4f3bbe9f306b8dc243
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

  1   2   3   4   5   >