date:20160720

[MediaWiki-commits] [Gerrit] Add Unicode to ICU mappings for versions 51-57 - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Add Unicode to ICU mappings for versions 51-57
..


Add Unicode to ICU mappings for versions 51-57

Change-Id: I35c2cdd2c56b491229f1f6d8b69b1de21af23aab
---
M includes/collation/IcuCollation.php
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/collation/IcuCollation.php 
b/includes/collation/IcuCollation.php
index 27f917b..dc8c607 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -444,6 +444,13 @@
$versionPrefix = substr( $icuVersion, 0, 3 );
// Source: http://site.icu-project.org/download
$map = [
+   '57.' => '8.0',
+   '56.' => '8.0',
+   '55.' => '7.0',
+   '54.' => '7.0',
+   '53.' => '6.3',
+   '52.' => '6.3',
+   '51.' => '6.2',
'50.' => '6.2',
'49.' => '6.1',
'4.8' => '6.0',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35c2cdd2c56b491229f1f6d8b69b1de21af23aab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Avoid the use of DB rollback() in LocalFileDeleteBatch - change (mediawiki/core)

2016-07-20 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid the use of DB rollback() in LocalFileDeleteBatch
..

Avoid the use of DB rollback() in LocalFileDeleteBatch

Race conditions are already handled by LockManager now.

Change-Id: Idb9ac511d565db4920aff7faa6ff291e05079798
---
M includes/filerepo/file/LocalFile.php
1 file changed, 4 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/300217/1

diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index cab9316..7b973ad 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -2286,13 +2286,6 @@
}
}
 
-   // Lock the filearchive rows so that the files don't get 
deleted by a cleanup operation
-   // We acquire this lock by running the inserts now, before the 
file operations.
-   // This potentially has poor lock contention characteristics -- 
an alternative
-   // scheme would be to insert stub filearchive entries with no 
fa_name and commit
-   // them in a separate transaction, then run the file ops, then 
update the fa_name fields.
-   $this->doDBInserts();
-
if ( !$repo->hasSha1Storage() ) {
// Removes non-existent file from the batch, so we 
don't get errors.
// This also handles files in the 'deleted' zone 
deleted via revision deletion.
@@ -2305,21 +2298,20 @@
 
// Execute the file deletion batch
$status = $this->file->repo->deleteBatch( 
$this->deletionBatch );
-
if ( !$status->isGood() ) {
$this->status->merge( $status );
}
}
 
if ( !$this->status->isOK() ) {
-   // Critical file deletion error
-   // Roll back inserts, release lock and abort
-   // TODO: delete the defunct filearchive rows if we are 
using a non-transactional DB
-   $this->file->unlockAndRollback();
+   // Critical file deletion error; abort
+   $this->file->unlock();
 
return $this->status;
}
 
+   // Copy the image/oldimage rows to filearchive
+   $this->doDBInserts();
// Delete image/oldimage rows
$this->doDBDeletes();
 

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

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

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

[MediaWiki-commits] [Gerrit] Support tokenizing simple HTML comments in the Balancer. - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Support tokenizing simple HTML comments in the Balancer.
..


Support tokenizing simple HTML comments in the Balancer.

Change-Id: Ib780595b13b7145e99867d16e3c225e6b2b91884
---
M includes/tidy/Balancer.php
M tests/phpunit/includes/tidy/BalancerTest.php
2 files changed, 96 insertions(+), 8 deletions(-)

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



diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 0fa96bd..37807ba 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -43,6 +43,11 @@
 # as soon as possible (usually as soon as the tag is closed) to reduce
 # its memory footprint.
 
+# We've been gradually lifting some of these restrictions to handle
+# non-sanitized output generated by extensions, but we shortcut the tokenizer
+# for speed (primarily by splitting on `<`) and so rely on syntactic
+# well-formedness.
+
 # On the other hand, I've been pretty careful to note with comments in the
 # code the places where this implementation omits features of the spec or
 # depends on the MediaWiki Sanitizer.  Perhaps in the future we'll want to
@@ -677,18 +682,28 @@
}
 
/**
+* Insert a comment at the appropriate place for inserting a node.
+* @param string $value Content of the comment.
+* @see 
https://html.spec.whatwg.org/multipage/syntax.html#insert-a-comment
+*/
+   public function insertComment( $value ) {
+   // Just another type of text node, except for tidy p-wrapping.
+   return $this->insertText( '', true );
+   }
+
+   /**
 * Insert text at the appropriate place for inserting a node.
 * @param string $value
 * @see 
https://html.spec.whatwg.org/multipage/syntax.html#appropriate-place-for-inserting-a-node
 */
-   public function insertText( $value ) {
+   public function insertText( $value, $isComment = false ) {
if (
$this->fosterParentMode &&
$this->currentNode->isA( 
BalanceSets::$tableSectionRowSet )
) {
$this->fosterParent( $value );
} elseif (
-   $this->tidyCompat &&
+   $this->tidyCompat && !$isComment &&
$this->currentNode->isA( BalanceSets::$tidyPWrapSet )
) {
$this->insertHTMLELement( 'mw:p-wrap', [] );
@@ -1725,9 +1740,10 @@
  * - The document is never in "quirks mode".
  * - All occurrences of < and > have been entity escaped, so we
  *   can parse tags by simply splitting on those two characters.
+ *   The character < must not appear inside comments.
  *   Similarly, all attributes have been "cleaned" and are double-quoted
  *   and escaped.
- * - All comments and null characters are assumed to have been removed.
+ * - All null characters are assumed to have been removed.
  * - We don't alter linefeeds after /.
  * - The following elements are disallowed: , , , ,
  *   , , , , , ,
@@ -1757,12 +1773,44 @@
private $stack;
private $strict;
private $tidyCompat;
+   private $allowComments;
 
private $textIntegrationMode = false;
private $pendingTableText;
private $originalInsertionMode;
private $fragmentContext;
private $formElementPointer;
+
+   /**
+* Valid HTML5 comments.
+* Regex borrowed from Tim Starling's "remex-html" project.
+*/
+   const VALID_COMMENT_REGEX = "~ !--
+   ( # 1. Comment match detector
+   > | -> | # Invalid short close
+   ( # 2. Comment contents
+   (?:
+   (?! --> )
+   (?! --!> )
+   (?! --! \z )
+   (?! -- \z )
+   (?! - \z )
+   .
+   )*+
+   )
+   ( # 3. Comment close
+   --> |   # Normal close
+   --!> |  # Comment end bang
+   ( # 4. Indicate matches 
requiring EOF
+   --! |   # EOF in comment end bang state
+   -- |# EOF in comment end state
+   -  |# EOF in comment end dash state
+   # EOF in comment state
+   )
+   )
+

[MediaWiki-commits] [Gerrit] Update wikimedia/wrappedstring to v2.2.0 - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Update wikimedia/wrappedstring to v2.2.0
..


Update wikimedia/wrappedstring to v2.2.0

Depends-On: Ie29b3a362ecbda988d93eb3c49fbca70a786ac05
Change-Id: I9c6857616950d18d90d53a6752d98f7ac3db20ad
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index d5bf93c..54eb3c0 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
"wikimedia/utfnormal": "1.0.3",
-   "wikimedia/wrappedstring": "2.1.1",
+   "wikimedia/wrappedstring": "2.2.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c6857616950d18d90d53a6752d98f7ac3db20ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Jforrester 
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] labs dnsrecursor: add tcy.wiki(pedia) - change (operations/puppet)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: labs dnsrecursor: add tcy.wiki(pedia)
..

labs dnsrecursor: add tcy.wiki(pedia)

Bug:T140898
Change-Id: Ia5fa4be4783c9bf1bee11644b22e4d289dafd835
---
M modules/role/manifests/labs/dnsrecursor.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/300215/1

diff --git a/modules/role/manifests/labs/dnsrecursor.pp 
b/modules/role/manifests/labs/dnsrecursor.pp
index 05ed505..af84f4b 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -263,7 +263,7 @@
 'svwikivoyage', 'svwiktionary', 'swwiki', 'swwikibooks',
 'swwiktionary', 'szlwiki', 'tawiki', 'tawikibooks',
 'tawikinews', 'tawikiquote', 'tawikisource', 'tawiktionary',
-'tenwiki', 'test2wiki', 'testwiki', 'testwikidatawiki',
+'tcywiki', 'tenwiki', 'test2wiki', 'testwiki', 'testwikidatawiki',
 'tetwiki', 'tewiki', 'tewikibooks', 'tewikiquote',
 'tewikisource', 'tewiktionary', 'tgwiki', 'tgwikibooks',
 'tgwiktionary', 'thwikibooks', 'thwikinews', 'thwikiquote',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5fa4be4783c9bf1bee11644b22e4d289dafd835
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] remove all aluminum/aluminium remnants - change (operations/dns)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: remove all aluminum/aluminium remnants
..

remove all aluminum/aluminium remnants

remove all remnants of aluminium and the aluminum
alias, also mgmt and .frack. because T140676 says
decom and the cables have already been remove.

double-check this also means the ".frack." name.

Bug:T140676
Change-Id: Ib6a7becba036609be89424e7390c344df63d3c2f
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/13/300213/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 6fab31c..0fe3905 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -971,7 +971,6 @@
 99  1H IN PTR   db1008.frack.eqiad.wmnet.
 100 1H IN PTR   db1025.frack.eqiad.wmnet.
 109 1H IN PTR   barium.frack.eqiad.wmnet.
-110 1H IN PTR   aluminium.frack.eqiad.wmnet.
 111 1H IN PTR   lutetium.frack.eqiad.wmnet.
 112 1H IN PTR   barium-fundraising.frack.eqiad.wmnet.
 113 1H IN PTR   americium.frack.eqiad.wmnet.
@@ -1738,7 +1737,6 @@
 
 3   1H  IN PTR  silicon.mgmt.eqiad.wmnet.
 3   1H  IN PTR  wmf3148.mgmt.eqiad.wmnet.
-4   1H  IN PTR  aluminum.mgmt.eqiad.wmnet.
 4   1H  IN PTR  wmf3147.mgmt.eqiad.wmnet.
 5   1H  IN PTR  magnesium.mgmt.eqiad.wmnet.
 5   1H  IN PTR  wmf3146.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 6b86983..75cf377 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1992,8 +1992,6 @@
 WMF3144 1H  IN A10.65.3.7
 magnesium   1H  IN A10.65.3.5
 WMF3146 1H  IN A10.65.3.5
-aluminium   1H  IN A10.65.3.4
-aluminum1H  IN CNAMEaluminium
 americium   1H  IN A10.65.3.225
 WMF4594 1H  IN A10.65.3.225
 bismuth 1H  IN A10.65.3.226
@@ -2325,7 +2323,6 @@
 ; EQIAD fundraising/payments
 
 $ORIGIN frack.eqiad.wmnet.
-aluminium   1H  IN A10.64.40.110
 americium   1H  IN A10.64.40.113
 barium  1H  IN A10.64.40.109
 barium-fundraising 1H  IN A10.64.40.112

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6a7becba036609be89424e7390c344df63d3c2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] Support tags in Balancer. - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Support  tags in Balancer.
..


Support  tags in Balancer.

Change-Id: I893fc231fea71f58449ed426d64ac99fdcb31d9e
---
M includes/tidy/Balancer.php
M tests/phpunit/includes/tidy/BalancerTest.php
2 files changed, 66 insertions(+), 9 deletions(-)

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



diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 1ad8a4a..0fa96bd 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -69,7 +69,7 @@
public static $unsupportedSet = [
self::HTML_NAMESPACE => [
'html' => true, 'head' => true, 'body' => true, 
'frameset' => true,
-   'form' => true, 'frame' => true,
+   'frame' => true,
'plaintext' => true, 'isindex' => true, 'textarea' => 
true,
'xmp' => true, 'iframe' => true, 'noembed' => true,
'noscript' => true, 'script' => true,
@@ -185,7 +185,14 @@
]
];
 
-   # OMITTED: formAssociatedSet, since we don't allow 
+   // See 
https://html.spec.whatwg.org/multipage/forms.html#form-associated-element
+   public static $formAssociatedSet = [
+   self::HTML_NAMESPACE => [
+   'button' => true, 'fieldset' => true, 'input' => true,
+   'keygen' => true, 'object' => true, 'output' => true,
+   'select' => true, 'textarea' => true, 'img' => true
+   ]
+   ];
 
public static $inScopeSet = [
self::HTML_NAMESPACE => [
@@ -1723,11 +1730,10 @@
  * - All comments and null characters are assumed to have been removed.
  * - We don't alter linefeeds after /.
  * - The following elements are disallowed: , , , ,
- *   , , , , , , ,
+ *   , , , , , ,
  *   , ,

[MediaWiki-commits] [Gerrit] Provide onTransaction* callbacks with the transaction result - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Provide onTransaction* callbacks with the transaction result
..


Provide onTransaction* callbacks with the transaction result

This can later be used to cancel certain deferred updates.

Change-Id: Ib6649b6ca400f15ff441531d0fd6aecc3e4619eb
---
M includes/db/Database.php
M includes/db/IDatabase.php
2 files changed, 18 insertions(+), 6 deletions(-)

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



diff --git a/includes/db/Database.php b/includes/db/Database.php
index 16ea219..f23e24f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2460,7 +2460,7 @@
final public function onTransactionIdle( callable $callback ) {
$this->mTrxIdleCallbacks[] = [ $callback, wfGetCaller() ];
if ( !$this->mTrxLevel ) {
-   $this->runOnTransactionIdleCallbacks();
+   $this->runOnTransactionIdleCallbacks( 
self::TRIGGER_IDLE );
}
}
 
@@ -2475,9 +2475,10 @@
/**
 * Actually any "on transaction idle" callbacks.
 *
+* @param integer $trigger IDatabase::TRIGGER_* constant
 * @since 1.20
 */
-   protected function runOnTransactionIdleCallbacks() {
+   protected function runOnTransactionIdleCallbacks( $trigger ) {
$autoTrx = $this->getFlag( DBO_TRX ); // automatic begin() 
enabled?
 
$e = $ePrior = null; // last exception
@@ -2492,7 +2493,7 @@
try {
list( $phpCallback ) = $callback;
$this->clearFlag( DBO_TRX ); // make 
each query its own transaction
-   call_user_func( $phpCallback );
+   call_user_func_array( $phpCallback, [ 
$trigger ] );
if ( $autoTrx ) {
$this->setFlag( DBO_TRX ); // 
restore automatic begin()
} else {
@@ -2623,7 +2624,7 @@
$this->mServer, $this->mDBname, 
$this->mTrxShortId, $writeTime );
}
 
-   $this->runOnTransactionIdleCallbacks();
+   $this->runOnTransactionIdleCallbacks( 
self::TRIGGER_COMMIT );
}
 
// Avoid fatals if close() was called
@@ -2699,7 +2700,7 @@
$this->mServer, $this->mDBname, 
$this->mTrxShortId, $writeTime );
}
 
-   $this->runOnTransactionIdleCallbacks();
+   $this->runOnTransactionIdleCallbacks( self::TRIGGER_COMMIT );
}
 
/**
@@ -2739,7 +2740,7 @@
 
$this->mTrxIdleCallbacks = []; // clear
$this->mTrxPreCommitCallbacks = []; // clear
-   $this->runOnTransactionIdleCallbacks();
+   $this->runOnTransactionIdleCallbacks( self::TRIGGER_ROLLBACK );
}
 
/**
diff --git a/includes/db/IDatabase.php b/includes/db/IDatabase.php
index 36772b8..c024632 100644
--- a/includes/db/IDatabase.php
+++ b/includes/db/IDatabase.php
@@ -33,6 +33,11 @@
  * @ingroup Database
  */
 interface IDatabase {
+   /* Constants to onTransactionResolution() callbacks */
+   const TRIGGER_IDLE = 1;
+   const TRIGGER_COMMIT = 2;
+   const TRIGGER_ROLLBACK = 3;
+
/**
 * A string describing the current software version, and possibly
 * other details in a user-friendly way. Will be listed on 
Special:Version, etc.
@@ -1223,6 +1228,9 @@
 *
 * This is useful for combining cooperative locks and DB transactions.
 *
+* The callback takes one argument:
+* How the transaction ended (IDatabase::TRIGGER_COMMIT or 
IDatabase::TRIGGER_ROLLBACK)
+*
 * @param callable $callback
 * @return mixed
 * @since 1.28
@@ -1242,6 +1250,9 @@
 *
 * Updates will execute in the order they were enqueued.
 *
+* The callback takes one argument:
+* How the transaction ended (IDatabase::TRIGGER_COMMIT or 
IDatabase::TRIGGER_IDLE)
+*
 * @param callable $callback
 * @since 1.20
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6649b6ca400f15ff441531d0fd6aecc3e4619eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Update graphoid to e514ccf - change (mediawiki...deploy)

2016-07-20 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Update graphoid to e514ccf
..

Update graphoid to e514ccf

List of changes:
e514ccf Fixed pending promises
xxx Update node module dependencies

Change-Id: I9e3c175f33bb5d8b663c459ad0c0f02840381bb8
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M node_modules/canvas/build/Release/canvas.node
M node_modules/canvas/build/Release/obj.target/canvas.node
M node_modules/canvas/build/Release/obj.target/canvas/src/Canvas.o
M node_modules/canvas/build/Release/obj.target/canvas/src/Image.o
M 
node_modules/d3-geo-projection/node_modules/brfs/node_modules/quote-stream/node_modules/buffer-equal/package.json
M node_modules/graph-shared/package.json
M node_modules/graph-shared/src/VegaWrapper.js
M node_modules/graph-shared/test/testVegaWrapper.js
M node_modules/nan/nan.h
M node_modules/nan/nan_persistent_pre_12_inl.h
M node_modules/nan/package.json
M node_modules/request/.travis.yml
A node_modules/request/codecov.yml
M node_modules/request/node_modules/form-data/package.json
D node_modules/request/node_modules/qs/.eslintignore
D node_modules/request/node_modules/qs/.eslintrc
D node_modules/request/node_modules/qs/.npmignore
D node_modules/request/node_modules/qs/.travis.yml
D node_modules/request/node_modules/qs/LICENSE
D node_modules/request/node_modules/qs/bower.json
D node_modules/request/node_modules/qs/component.json
D node_modules/request/node_modules/qs/dist/qs.js
D node_modules/request/node_modules/qs/lib/index.js
D node_modules/request/node_modules/qs/lib/parse.js
D node_modules/request/node_modules/qs/lib/stringify.js
D node_modules/request/node_modules/qs/lib/utils.js
D node_modules/request/node_modules/qs/package.json
D node_modules/request/node_modules/qs/test/index.js
D node_modules/request/node_modules/qs/test/parse.js
D node_modules/request/node_modules/qs/test/stringify.js
D node_modules/request/node_modules/qs/test/utils.js
M node_modules/request/package.json
M node_modules/request/request.js
M node_modules/service-runner/node_modules/core-js/bower.json
M node_modules/service-runner/node_modules/core-js/build/config.js
M node_modules/service-runner/node_modules/core-js/client/core.js
M node_modules/service-runner/node_modules/core-js/client/core.min.js
M node_modules/service-runner/node_modules/core-js/client/core.min.js.map
M node_modules/service-runner/node_modules/core-js/client/library.js
M node_modules/service-runner/node_modules/core-js/client/library.min.js
M node_modules/service-runner/node_modules/core-js/client/library.min.js.map
M node_modules/service-runner/node_modules/core-js/client/shim.js
M node_modules/service-runner/node_modules/core-js/client/shim.min.js
M node_modules/service-runner/node_modules/core-js/client/shim.min.js.map
M node_modules/service-runner/node_modules/core-js/es7/observable.js
M node_modules/service-runner/node_modules/core-js/fn/date/to-string.js
M node_modules/service-runner/node_modules/core-js/fn/observable.js
M node_modules/service-runner/node_modules/core-js/fn/symbol/has-instance.js
M node_modules/service-runner/node_modules/core-js/library/es7/observable.js
M node_modules/service-runner/node_modules/core-js/library/fn/date/to-string.js
M node_modules/service-runner/node_modules/core-js/library/fn/observable.js
M 
node_modules/service-runner/node_modules/core-js/library/fn/symbol/has-instance.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_a-number-value.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_array-reduce.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_array-species-constructor.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_collection-strong.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_create-property.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_date-to-primitive.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_enum-bug-keys.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_ie8-dom-define.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_inherit-if-required.js
M 
node_modules/service-runner/node_modules/core-js/library/modules/_object-create.js
M

[MediaWiki-commits] [Gerrit] PSHH - Paralell SH Hell - change (mediawiki...release)

2016-07-20 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: PSHH - Paralell SH Hell
..

PSHH - Paralell SH Hell

Change-Id: If46fcd63dcefc74ecafb5783e2ff247042e5916a
---
M .arcconfig
A pshh/README.rst
A pshh/bin/pshh
A pshh/branch.psh
A pshh/pshh/__init__.py
A pshh/pshh/builtins.py
A pshh/pshh/command.py
A pshh/pshh/git.py
A pshh/pshh/lists.py
A pshh/pshh/shell.py
A pshh/pshh/style.py
A pshh/pshh/util.py
12 files changed, 677 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/11/300211/1

diff --git a/.arcconfig b/.arcconfig
index 9b947af..ea3aebb 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,5 +1,4 @@
 {
   "phabricator.uri" : "https://phabricator.wikimedia.org/;,
-  "repository.callsign": "MREL",
-  "project.name": "Release-Engineering"
+  "repository.callsign": "MREL"
 }
diff --git a/pshh/README.rst b/pshh/README.rst
new file mode 100644
index 000..0986581
--- /dev/null
+++ b/pshh/README.rst
@@ -0,0 +1,18 @@
+
+pshh
+
+
+pshh (Parallel Shell Hell) is a tool to execute arbitrary bits of python code,
+in parallel, over a list of input lines. The input will usually be a list of
+paths.  pshh keeps track of any failures and makes it easy to retry just the
+failed paths, perhaps after modifying the code that you want to execute.
+
+pshh is essentially a sophisticated for loop, which significantly improves on
+
+.. code-block:: bash
+
+#!/bin/bash
+for i in $( ls ); do
+# do stuff with $i
+done
+
diff --git a/pshh/bin/pshh b/pshh/bin/pshh
new file mode 100755
index 000..26c7b87
--- /dev/null
+++ b/pshh/bin/pshh
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+"""
+This is the main entrypoint for pshh.
+Here we set up the appropriate imports,
+define styles for prompt toolkit,
+configure sys.path, etc.
+and finally run prompt toolkit in an infinite loop
+"""
+
+import os
+import sys
+from os.path import dirname
+script = os.path.realpath(sys.argv[0])
+script_dir = dirname(dirname(script))
+sys.path.append(script_dir)
+sys.path.append(os.getcwd())
+xdg_dir = os.path.expanduser("~/.local/share/pshh")
+
+if not os.path.exists(xdg_dir):
+os.mkdir(xdg_dir)
+
+import pshh.shell
+import pshh.lists
+pshh.shell.script_dir = script_dir
+pshh.lists.xdg_dir = xdg_dir
+pshh.shell.xdg_dir = xdg_dir
+
+if __name__ == '__main__':
+pshh.shell.main()
diff --git a/pshh/branch.psh b/pshh/branch.psh
new file mode 100644
index 000..3679af9
--- /dev/null
+++ b/pshh/branch.psh
@@ -0,0 +1,7 @@
+from sh import git
+from pshh.util import cd
+
+
+def branch_cmd(directory, cmd_args):
+with cd(directory):
+return git('branch', *cmd_args)
diff --git a/pshh/pshh/__init__.py b/pshh/pshh/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/pshh/pshh/__init__.py
diff --git a/pshh/pshh/builtins.py b/pshh/pshh/builtins.py
new file mode 100644
index 000..77f194f
--- /dev/null
+++ b/pshh/pshh/builtins.py
@@ -0,0 +1,27 @@
+import os
+from pshh.command import pshh_command, FilenameParameter, get_handlers
+from pshh.lists import list_manager
+from pshh.util import pshh_result
+
+
+@pshh_command('load_file')
+def load_file(filename: FilenameParameter()):
+""" Load a list of paths from a file """
+if not os.path.isfile(filename):
+raise IOError('Not a file: %s' % filename)
+
+print('load file: %s' % filename)
+with open(filename) as f:
+data = f.read()
+if data:
+return list_manager.load_list(data.splitlines())
+
+
+@pshh_command()
+def help():
+""" Display command help """
+print("Command".ljust(20), "Args")
+print("---".ljust(20), "")
+for handler in get_handlers().values():
+print(str(handler))
+return pshh_result()
diff --git a/pshh/pshh/command.py b/pshh/pshh/command.py
new file mode 100644
index 000..5bed68d
--- /dev/null
+++ b/pshh/pshh/command.py
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+"""
+pshh.command
+~~
+command registry for built-in pshh commands
+
+"""
+
+import os
+import sh
+import shlex
+import sys
+
+from pshh.util import pshh_result, CommandError
+from pathlib import Path
+from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.document import Document
+from inspect import signature
+
+
+command_handlers = {
+
+}
+
+
+class CompletableParameter(object):
+"""
+The base class for autocompletion parameter annotations
+"""
+def completion(self):
+return
+
+
+class FilenameParameter(CompletableParameter):
+"""
+Used to annotate parameters which should contain a filename
+"""
+def completion(self):
+p = Path(os.getcwd())
+for child in p.iterdir():
+if child.is_file():
+yield Completion(child.name,
+ start_position=0,
+

[MediaWiki-commits] [Gerrit] Make unit tests a bit more readable by renaming helpers - change (WrappedString)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Make unit tests a bit more readable by renaming helpers
..


Make unit tests a bit more readable by renaming helpers

* getFoo() -> getSquareBracketWrappedX()
* getBar() -> getCurlyBracketWrappedY()

Change-Id: Ibd7b663e086a5098559c77d5d84aacd42e739e14
---
M tests/WrappedStringListTest.php
M tests/WrappedStringTest.php
2 files changed, 35 insertions(+), 35 deletions(-)

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



diff --git a/tests/WrappedStringListTest.php b/tests/WrappedStringListTest.php
index f78a07d..0edefdc 100644
--- a/tests/WrappedStringListTest.php
+++ b/tests/WrappedStringListTest.php
@@ -34,26 +34,26 @@
  */
 class WrappedStringListTest extends \PHPUnit_Framework_TestCase {
 
-   protected static function getFoo() {
+   protected static function getSquareBracketWrappedX() {
return new WrappedString( '[x]', '[', ']' );
}
 
-   protected static function getBar() {
+   protected static function getCurlyBracketWrappedY() {
return new WrappedString( '{y}', '{', '}' );
}
 
public function testJoin() {
$wraps1 = array(
-   self::getFoo(),
-   self::getFoo(),
-   self::getFoo(),
-   self::getBar(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
);
$list1 = WrappedString::join( "\n", $wraps1 );
$wraps2 = array(
-   self::getBar(),
-   self::getFoo(),
-   self::getBar(),
+   self::getCurlyBracketWrappedY(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
);
$list2 = WrappedString::join( "\n", $wraps2 );
$this->assertEquals(
@@ -63,16 +63,16 @@
);
 
$wraps1 = array(
-   self::getFoo(),
-   self::getFoo(),
-   self::getFoo(),
-   self::getBar(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
);
$list1 = WrappedString::join( '', $wraps1 );
$wraps2 = array(
-   self::getBar(),
-   self::getFoo(),
-   self::getBar(),
+   self::getCurlyBracketWrappedY(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
);
$list2 = WrappedString::join( "\n", $wraps2 );
$this->assertEquals(
@@ -82,14 +82,14 @@
);
 
$wraps1 = array(
-   self::getFoo(),
-   self::getFoo(),
-   self::getFoo(),
-   self::getBar(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
);
$list1 = WrappedString::join( '', $wraps1 );
$wraps2 = array(
-   self::getBar(),
+   self::getCurlyBracketWrappedY(),
);
$list2 = WrappedString::join( '', $wraps2 );
$this->assertEquals(
@@ -99,13 +99,13 @@
);
 
$lists = [
-   self::getFoo(),
+   self::getSquareBracketWrappedX(),
new WrappedStringList( '', [
-   self::getFoo(),
-   self::getFoo(),
-   self::getBar(),
+   self::getSquareBracketWrappedX(),
+   self::getSquareBracketWrappedX(),
+   self::getCurlyBracketWrappedY(),
] ),
-   self::getBar(),
+   self::getCurlyBracketWrappedY(),
'meh'
];
$this->assertEquals(
diff --git a/tests/WrappedStringTest.php b/tests/WrappedStringTest.php
index 6c82e8b..c7c1fe2 100644
--- a/tests/WrappedStringTest.php
+++ b/tests/WrappedStringTest.php
@@ -43,23 +43,23 @@
}
 
 
-   protected static

[MediaWiki-commits] [Gerrit] Minor bug fixes to Balancer. - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Minor bug fixes to Balancer.
..


Minor bug fixes to Balancer.

This is a follow-up to the refactor done in
5726c9ceb0644af360d37b86351b97ddfcbee20c which prevents a crash when
the first entry in the stack happens to be a BalanceMarker (and thus
doesn't have a `$localName` property).  It also fixes an unrelated
issue where unpaired close-heading tags (like ``) get entity-escaped
instead of ignored.

Test cases exposing these bugs are added in
Ie854cf99f7e72bcca1bb8565ace558a43dcb6379.

Change-Id: Ia9a1d435be1be10512071f5ff626b68742863483
---
M includes/tidy/Balancer.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 9e96b14..4bcaf1a 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -1613,9 +1613,11 @@
 
// Loop backward through the list until we find a marker or an
// open element
+   $foundit = false;
while ( $entry->prevAFE ) {
$entry = $entry->prevAFE;
if ( $entry instanceof BalanceMarker || 
$stack->indexOf( $entry ) >= 0 ) {
+   $foundit = true;
break;
}
}
@@ -1624,7 +1626,7 @@
// the first element if we didn't find a marker or open 
element),
// recreating formatting elements and pushing them back onto 
the list
// of open elements.
-   if ( $entry->prevAFE ) {
+   if ( $foundit ) {
$entry = $entry->nextAFE;
}
do {
@@ -2656,7 +2658,7 @@
case 'h5':
case 'h6':
if ( !$this->stack->inScope( 
BalanceSets::$headingSet ) ) {
-   return;
+   return true; # ignore
}
$this->stack->generateImpliedEndTags();
$this->stack->popTag( BalanceSets::$headingSet 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9a1d435be1be10512071f5ff626b68742863483
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Made non-exception rollback() calls safer - change (mediawiki/core)

2016-07-20 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made non-exception rollback() calls safer
..

Made non-exception rollback() calls safer

Use rollbackMasterChanges() instead so that all DBs get reverted.
Otherwise, external DB updates may get committed while related local
DB changes are rolled back.

Change-Id: I74de77f4b12dc15c0473c272d090caeeb97d6983
---
M includes/FileDeleteForm.php
M includes/revisiondelete/RevDelList.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/300209/1

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 98f8283..361058b 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -203,7 +203,7 @@
$dbw->endAtomic( __METHOD__ );
} else {
// Page deleted but file still 
there? rollback page delete
-   $dbw->rollback( __METHOD__ );
+   
wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
}
} else {
// Done; nothing changed
diff --git a/includes/revisiondelete/RevDelList.php 
b/includes/revisiondelete/RevDelList.php
index 0a86e94..bad9d77 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -244,8 +244,8 @@
// Move files, if there are any
$status->merge( $this->doPreCommitUpdates() );
if ( !$status->isOK() ) {
-   // Fatal error, such as no configured archive directory
-   $dbw->rollback( __METHOD__ );
+   // Fatal error, such as no configured archive directory 
or I/O failures
+   wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
return $status;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Move efStripKeyRecursive from global scope - change (mediawiki...EventLogging)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Move efStripKeyRecursive from global scope
..


Move efStripKeyRecursive from global scope

Change-Id: I8a0480daa325c760aa570957bba23bb60e2d0a4c
---
M EventLogging.php
M includes/ResourceLoaderSchemaModule.php
2 files changed, 17 insertions(+), 17 deletions(-)

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



diff --git a/EventLogging.php b/EventLogging.php
index a4198fe..6ea5be5 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -107,22 +107,6 @@
return $root->validate();
 }
 
-/**
- * Recursively remove a key from an array and all its subarray members.
- * Does not detect cycles.
- *
- * @param array &$array Array from which key should be stripped.
- * @param string $key Key to remove.
- */
-function efStripKeyRecursive( &$array, $key ) {
-   unset( $array[ $key ] );
-   foreach ( $array as $k => &$v ) {
-   if ( is_array( $v ) ) {
-   efStripKeyRecursive( $v, $key );
-   }
-   }
-}
-
 // Classes
 
 $wgAutoloadClasses += [
diff --git a/includes/ResourceLoaderSchemaModule.php 
b/includes/ResourceLoaderSchemaModule.php
index d86a05f..f33db66 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -86,8 +86,24 @@
 */
public function getScript( ResourceLoaderContext $context ) {
$schema = $this->schema->jsonSerialize();
-   efStripKeyRecursive( $schema, 'description' );
+   $this->stripKeyRecursive( $schema, 'description' );
$params = [ $this->schema->title, $schema ];
return Xml::encodeJsCall( 'mediaWiki.eventLog.declareSchema', 
$params );
}
+
+   /**
+* Recursively remove a key from an array and all its subarray members.
+* Does not detect cycles.
+*
+* @param array &$array Array from which key should be stripped.
+* @param string $key Key to remove.
+*/
+   private function stripKeyRecursive( &$array, $key ) {
+   unset( $array[ $key ] );
+   foreach ( $array as $k => &$v ) {
+   if ( is_array( $v ) ) {
+   $this->stripKeyRecursive( $v, $key );
+   }
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a0480daa325c760aa570957bba23bb60e2d0a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Avoid calling rollback() in setVisibility() when nothing cha... - change (mediawiki/core)

2016-07-20 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid calling rollback() in setVisibility() when nothing changed
..

Avoid calling rollback() in setVisibility() when nothing changed

Change-Id: I7fde64fe1e6c9553447bcb9e62a1a9530f9e52ce
---
M includes/revisiondelete/RevDelList.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/includes/revisiondelete/RevDelList.php 
b/includes/revisiondelete/RevDelList.php
index 0a86e94..3cb8d5e 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -234,7 +234,6 @@
}
 
if ( $status->successCount == 0 ) {
-   $dbw->rollback( __METHOD__ );
return $status;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Update wikimedia/wrappedstring to v2.2.0 - change (mediawiki/core)

2016-07-20 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Update wikimedia/wrappedstring to v2.2.0
..

Update wikimedia/wrappedstring to v2.2.0

Depends-On: Ie29b3a362ecbda988d93eb3c49fbca70a786ac05
Change-Id: I9c6857616950d18d90d53a6752d98f7ac3db20ad
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index d5bf93c..54eb3c0 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
"wikimedia/utfnormal": "1.0.3",
-   "wikimedia/wrappedstring": "2.1.1",
+   "wikimedia/wrappedstring": "2.2.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {

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

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

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

[MediaWiki-commits] [Gerrit] Update wikimedia/wrappedstring to v2.2.0 - change (mediawiki/vendor)

2016-07-20 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Update wikimedia/wrappedstring to v2.2.0
..

Update wikimedia/wrappedstring to v2.2.0

Change-Id: Ie29b3a362ecbda988d93eb3c49fbca70a786ac05
---
M composer.json
M composer.lock
M composer/installed.json
M wikimedia/wrappedstring/src/WrappedStringList.php
4 files changed, 63 insertions(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/04/300204/1

diff --git a/composer.json b/composer.json
index 6aa1a14..8913a8c 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"wikimedia/running-stat": "1.1.0",
"wikimedia/textcat": "1.1.3",
"wikimedia/utfnormal": "1.0.3",
-   "wikimedia/wrappedstring": "2.1.1",
+   "wikimedia/wrappedstring": "2.2.0",
"zordius/lightncandy": "0.23"
}
 }
diff --git a/composer.lock b/composer.lock
index 483b0e1..75e287e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "1906eee8984e6bdec91b423603f41b6b",
-"content-hash": "ebfb398482cb3a4c6c513052fab8644a",
+"hash": "793bec2b48f7fb77677665a99a92f255",
+"content-hash": "deca958f5a244855772fc209c9139191",
 "packages": [
 {
 "name": "composer/semver",
@@ -1729,16 +1729,16 @@
 },
 {
 "name": "wikimedia/wrappedstring",
-"version": "v2.1.1",
+"version": "v2.2.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/WrappedString.git;,
-"reference": "a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde"
+"reference": "738a89411fec30cb381b88905cacbcbe082db6a9"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/WrappedString/zipball/a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde;,
-"reference": "a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde",
+"url": 
"https://api.github.com/repos/wikimedia/WrappedString/zipball/738a89411fec30cb381b88905cacbcbe082db6a9;,
+"reference": "738a89411fec30cb381b88905cacbcbe082db6a9",
 "shasum": ""
 },
 "require": {
@@ -1767,7 +1767,7 @@
 ],
 "description": "Automatically compact sequentially-outputted 
strings that share a common prefix / suffix pair.",
 "homepage": "https://www.mediawiki.org/wiki/WrappedString;,
-"time": "2016-07-07 19:22:03"
+"time": "2016-07-21 00:41:10"
 },
 {
 "name": "zordius/lightncandy",
diff --git a/composer/installed.json b/composer/installed.json
index 91c106a..26f61ee 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1692,50 +1692,6 @@
 "homepage": "https://www.mediawiki.org/wiki/CDB;
 },
 {
-"name": "wikimedia/wrappedstring",
-"version": "v2.1.1",
-"version_normalized": "2.1.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/WrappedString.git;,
-"reference": "a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/WrappedString/zipball/a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde;,
-"reference": "a3e07adc3ea0cf62568aedf29ffe4eb2f90b7cde",
-"shasum": ""
-},
-"require": {
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "^0.9.0.0",
-"mediawiki/mediawiki-codesniffer": "0.4.0",
-"phpunit/phpunit": "^4.7.7.0"
-},
-"time": "2016-07-07 19:22:03",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"psr-4": {
-"WrappedString\\": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Timo Tijhof",
-"email": "krinklem...@gmail.com"
-}
-],
-"description": "Automatically compact sequentially-outputted strings 
that share a common prefix / suffix pair.",
-"homepage": "https://www.mediawiki.org/wiki/WrappedString;
-},
-{
 "name": "composer/semver",
 "version": "1.4.1",
 "version_normalized": "1.4.1.0",
@@ -1879,5 +1835,49 @@
 ],
 "description": "Provides library of common widgets, layouts, and

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: abce501..522b349 - change (mediawiki/extensions)

2016-07-20 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: abce501..522b349
..

Syncronize VisualEditor: abce501..522b349

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


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

diff --git a/VisualEditor b/VisualEditor
index abce501..522b349 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit abce5019b10057180d9beb13ecb17ddcd6199c08
+Subproject commit 522b3498ce9e32692faa3b443beb289936ca748b

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: abce501..522b349 - change (mediawiki/extensions)

2016-07-20 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: abce501..522b349
..


Syncronize VisualEditor: abce501..522b349

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

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



diff --git a/VisualEditor b/VisualEditor
index abce501..522b349 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit abce5019b10057180d9beb13ecb17ddcd6199c08
+Subproject commit 522b3498ce9e32692faa3b443beb289936ca748b

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

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

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

[MediaWiki-commits] [Gerrit] MWGalleryDialog: Add new 'slideshow' mode - change (mediawiki...VisualEditor)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: MWGalleryDialog: Add new 'slideshow' mode
..


MWGalleryDialog: Add new 'slideshow' mode

Change-Id: I73052def5e8c082f27606b2ff094834fd5d11908
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
4 files changed, 13 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 85eaa1b..f442ed0 100644
--- a/extension.json
+++ b/extension.json
@@ -1758,6 +1758,7 @@

"visualeditor-mwgallerydialog-mode-dropdown-label-packed",

"visualeditor-mwgallerydialog-mode-dropdown-label-packed-hover",

"visualeditor-mwgallerydialog-mode-dropdown-label-packed-overlay",
+   
"visualeditor-mwgallerydialog-mode-dropdown-label-slideshow",

"visualeditor-mwgallerydialog-mode-dropdown-label-traditional",
"visualeditor-mwgallerydialog-mode-field-label",

"visualeditor-mwgallerydialog-remove-button-label",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 8dfe99d..acbeb92 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -279,6 +279,7 @@
"visualeditor-mwgallerydialog-mode-dropdown-label-packed": "Packed",
"visualeditor-mwgallerydialog-mode-dropdown-label-packed-hover": 
"Packed with captions on hover",
"visualeditor-mwgallerydialog-mode-dropdown-label-packed-overlay": 
"Packed with overlaid captions",
+   "visualeditor-mwgallerydialog-mode-dropdown-label-slideshow": 
"Slideshow",
"visualeditor-mwgallerydialog-mode-dropdown-label-traditional": 
"Traditional",
"visualeditor-mwgallerydialog-mode-field-label": "Display mode",
"visualeditor-mwgallerydialog-remove-button-label": "Remove image",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 54d1b25..5637ab2 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -290,6 +290,7 @@
"visualeditor-mwgallerydialog-mode-dropdown-label-packed": "Label for 
the packed option in the mode dropdown of the gallery dialog",
"visualeditor-mwgallerydialog-mode-dropdown-label-packed-hover": "Label 
for the packed-hover option in the mode dropdown of the gallery dialog",
"visualeditor-mwgallerydialog-mode-dropdown-label-packed-overlay": 
"Label for the packed-overlay option in the mode dropdown of the gallery 
dialog",
+   "visualeditor-mwgallerydialog-mode-dropdown-label-slideshow": "Label 
for the slideshow option in the mode dropdown of the gallery dialog",
"visualeditor-mwgallerydialog-mode-dropdown-label-traditional": "Label 
for the traditional option in the mode dropdown of the gallery dialog",
"visualeditor-mwgallerydialog-mode-field-label": "Label for the mode 
field of the gallery dialog",
"visualeditor-mwgallerydialog-remove-button-label": "Label for the 
remove image button of the gallery dialog\n{{Identical|Remove}}",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 9499d06..3ab93d4 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -145,6 +145,10 @@
new OO.ui.OptionWidget( {
data: 'packed-hover',
label: ve.msg( 
'visualeditor-mwgallerydialog-mode-dropdown-label-packed-hover' )
+   } ),
+   new OO.ui.OptionWidget( {
+   data: 'slideshow',
+   label: ve.msg( 
'visualeditor-mwgallerydialog-mode-dropdown-label-slideshow' )
} )
]
}
@@ -510,7 +514,12 @@
  */
 ve.ui.MWGalleryDialog.prototype.onModeDropdownChange = function () {
var mode = this.modeDropdown.getMenu().getSelectedItem().getData(),
-   disabled = mode === 'packed' || mode === 'packed-overlay' || 
mode === 'packed-hover';
+   disabled = (
+   mode === 'packed' ||
+   mode === 'packed-overlay' ||
+   mode === 'packed-hover' ||
+   mode === 'slideshow'
+   );
 
this.widthsInput.setDisabled( disabled );
this.perrowInput.setDisabled( disabled );

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

Gerrit-MessageType: merged
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] /* -> /** - change (mediawiki...EventLogging)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: /* -> /**
..


/* -> /**

Change-Id: Ie7824b4d6abbcff5d0d6e7ac77f002f96c030284
---
M includes/JsonSchema.php
1 file changed, 26 insertions(+), 28 deletions(-)

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



diff --git a/includes/JsonSchema.php b/includes/JsonSchema.php
index 5d65cd0..433fc42 100644
--- a/includes/JsonSchema.php
+++ b/includes/JsonSchema.php
@@ -49,7 +49,7 @@
 }
 
 class JsonUtil {
-   /*
+   /**
 * Converts the string into something safe for an HTML id.
 * performs the easiest transformation to safe id, but is lossy
 */
@@ -65,7 +65,7 @@
 
}
 
-   /*
+   /**
 * Converts data to JSON format with pretty-formatting, but limited to 
a single line and escaped
 * to be suitable for wikitext message parameters.
 */
@@ -80,7 +80,7 @@
}
}
 
-   /*
+   /**
 * Given a type (e.g. 'object', 'integer', 'string'), return the 
default/empty
 * value for that type.
 */
@@ -110,7 +110,7 @@
return $newvalue;
}
 
-   /*
+   /**
 * Return a JSON-schema type for arbitrary data $foo
 */
public static function getType( $foo ) {
@@ -145,7 +145,7 @@
 
}
 
-   /*
+   /**
 * Generate a schema from a data example ($parent)
 */
public static function getSchemaArray( $parent ) {
@@ -168,7 +168,7 @@
return $schema;
}
 
-   /*
+   /**
 * User interface messages suitable for translation.
 * Note: this merely acts as a passthrough to MediaWiki's wfMessage 
call.
 */
@@ -192,11 +192,10 @@
  *nodes, as well as pointers to parent refs
  */
 
-/*
+/**
  * Structure for representing a generic tree which each node is aware of its
  * context (can refer to its parent).  Used for schema refs.
  */
-
 class TreeRef {
public $node;
public $parent;
@@ -210,11 +209,10 @@
}
 }
 
-/*
+/**
  * Structure for representing a data tree, where each node (ref) is aware of 
its
  * context and associated schema.
  */
-
 class JsonTreeRef {
public function __construct( $node, $parent = null, $nodeindex = null,
$nodename = null, $schemaref = null ) {
@@ -230,7 +228,7 @@
}
}
 
-   /*
+   /**
 * Associate the relevant node of the JSON schema to this node in the 
JSON
 */
public function attachSchema( $schema = null ) {
@@ -244,7 +242,7 @@
}
}
 
-   /*
+   /**
 *  Return the title for this ref, typically defined in the schema as 
the
 *  user-friendly string for this node.
 */
@@ -258,7 +256,7 @@
}
}
 
-   /*
+   /**
 * Rename a user key.  Useful for interactive editing/modification, but 
not
 * so helpful for static interpretation.
 */
@@ -271,7 +269,7 @@
unset( $this->parent->node[$oldindex] );
}
 
-   /*
+   /**
 * Return the type of this node as specified in the schema.  If "any",
 * infer it from the data.
 */
@@ -294,7 +292,7 @@
 
}
 
-   /*
+   /**
 * Return a unique identifier that may be used to find a node.  This
 * is only as robust as stringToId is (i.e. not that robust), but is
 * good enough for many cases.
@@ -307,7 +305,7 @@
}
}
 
-   /*
+   /**
 *  Get a path to the element in the array.  if $foo['a'][1] would load 
the
 *  node, then the return value of this would be array('a',1)
 */
@@ -321,7 +319,7 @@
}
}
 
-   /*
+   /**
 *  Return path in something that looks like an array path.  For 
example,
 *  for this data: [{'0a':1,'0b':{'0ba':2,'0bb':3}},{'1a':4}]
 *  the leaf node with a value of 4 would have a data path of 
'[1]["1a"]',
@@ -336,7 +334,7 @@
return $retval;
}
 
-   /*
+   /**
 *  Return data path in user-friendly terms.  This will use the same
 *  terminology as used in the user interface (1-indexed arrays)
 */
@@ -349,7 +347,7 @@
}
}
 
-   /*
+   /**
 * Return the child ref for $this ref associated with a given $key
 */
public function getMappingChildRef( $key ) {
@@ -380,7 +378,7 @@
return $jsoni;
}
 
-   /*
+   /**
 * Return the child ref for $this ref associated with a given index $i
 */
public function getSequenceChildRef( $i ) {
@@ -397,7 +395,7 @@
return $jsoni;
}
 
-   /*
+   /**
 * Validate the JSON node in this ref against the attached

[MediaWiki-commits] [Gerrit] Combine objects between lists and non-lists - change (WrappedString)

2016-07-20 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Combine objects between lists and non-lists
..

Combine objects between lists and non-lists

Previously when handling an array containing a single WrappedString
and a WrappedStringList, the objects would not be merged.

Forcing consumers to wrap every object in a list just because they
get one list is annoying.

Test output difference:
> -'[x][xx]{y}{y}meh'
> +'[xxx]{yy}meh'

Change-Id: I311a9e58b55a88c8e21ba41ec945f3f9fd04f89b
---
M src/WrappedStringList.php
M tests/WrappedStringListTest.php
2 files changed, 27 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/WrappedString 
refs/changes/02/300202/1

diff --git a/src/WrappedStringList.php b/src/WrappedStringList.php
index 32ecf28..41ff159 100644
--- a/src/WrappedStringList.php
+++ b/src/WrappedStringList.php
@@ -57,13 +57,21 @@
 *
 * Does not modify the given array or any of the objects in it.
 *
-* @param WrappedStringList[] $wraps
+* @param array $lists Array of strings and/or WrappedStringList objects
+* @param string $outerSep
 * @return string[] Compacted list
 */
-   protected static function compact( array $lists ) {
+   protected static function compact( array $lists, $outerSep ) {
$consolidated = array();
$prev = current( $lists );
+   // Wrap single WrappedString objects in a list for easier 
merging
+   if ( $prev instanceof WrappedString ) {
+   $prev = new WrappedStringList( $outerSep, [ $prev ] );
+   }
while ( ( $curr = next( $lists ) ) !== false ) {
+   if ( $curr instanceof WrappedString ) {
+   $curr = new WrappedStringList( $outerSep, [ 
$curr ] );
+   }
if ( $prev instanceof WrappedStringList ) {
if ( $curr instanceof WrappedStringList
&& $prev->sep === $curr->sep
@@ -101,7 +109,7 @@
 * @return string
 */
public static function join( $sep, array $lists ) {
-   return implode( $sep, self::compact( $lists ) );
+   return implode( $sep, self::compact( $lists, $sep ) );
}
 
/** @return string */
diff --git a/tests/WrappedStringListTest.php b/tests/WrappedStringListTest.php
index bd3e876..f78a07d 100644
--- a/tests/WrappedStringListTest.php
+++ b/tests/WrappedStringListTest.php
@@ -97,5 +97,21 @@
WrappedStringList::join( '', [ 'meh', $list1, $list2, 
'meh' ] ),
"Two lists and a regular string"
);
+
+   $lists = [
+   self::getFoo(),
+   new WrappedStringList( '', [
+   self::getFoo(),
+   self::getFoo(),
+   self::getBar(),
+   ] ),
+   self::getBar(),
+   'meh'
+   ];
+   $this->assertEquals(
+   "[xxx]{yy}meh",
+   WrappedStringList::join( '', $lists ),
+   "Lists, wraps, and regular strings"
+   );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I311a9e58b55a88c8e21ba41ec945f3f9fd04f89b
Gerrit-PatchSet: 1
Gerrit-Project: WrappedString
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Use correct string concat operator - change (mediawiki...EventLogging)

2016-07-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Use correct string concat operator
..

Use correct string concat operator

Change-Id: Id27747f7a70515fba8f92b1f75dd32e99364e73b
---
M includes/JsonSchema.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/JsonSchema.php b/includes/JsonSchema.php
index 5d65cd0..1cfe6e0 100644
--- a/includes/JsonSchema.php
+++ b/includes/JsonSchema.php
@@ -303,7 +303,7 @@
if ( is_null( $this->parent ) ) {
return "json_root";
} else {
-   return $this->parent->getFullIndex() + "." + 
JsonUtil::stringToId( $this->nodeindex );
+   return $this->parent->getFullIndex() . "." . 
JsonUtil::stringToId( $this->nodeindex );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id27747f7a70515fba8f92b1f75dd32e99364e73b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Use opt.addCorsOrigin instead of opt.isApiCall - change (mediawiki...Graph)

2016-07-20 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Use opt.addCorsOrigin instead of opt.isApiCall
..

Use opt.addCorsOrigin instead of opt.isApiCall

Fixes cross-wiki CORS issue

Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
---
M lib/graph2.compiled.js
M modules/graph2.js
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index a26a6bf..0389731 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -44,7 +44,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.
@@ -371,6 +371,7 @@
 urlParts.query = this.objExtender(urlParts.query, {format: 
'json', formatversion: '2'});
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikirest':
@@ -406,6 +407,7 @@
 };
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikifile':
diff --git a/modules/graph2.js b/modules/graph2.js
index 23dd211..f27a4b1 100644
--- a/modules/graph2.js
+++ b/modules/graph2.js
@@ -43,7 +43,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.28.0-wmf.11
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Use opt.addCorsOrigin instead of opt.isApiCall - change (mediawiki...Graph)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Use opt.addCorsOrigin instead of opt.isApiCall
..


Use opt.addCorsOrigin instead of opt.isApiCall

Fixes cross-wiki CORS issue

Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
---
M lib/graph2.compiled.js
M modules/graph2.js
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index a26a6bf..0389731 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -44,7 +44,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.
@@ -371,6 +371,7 @@
 urlParts.query = this.objExtender(urlParts.query, {format: 
'json', formatversion: '2'});
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikirest':
@@ -406,6 +407,7 @@
 };
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikifile':
diff --git a/modules/graph2.js b/modules/graph2.js
index 23dd211..f27a4b1 100644
--- a/modules/graph2.js
+++ b/modules/graph2.js
@@ -43,7 +43,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix mixed leading whitespace - change (mediawiki...EventLogging)

2016-07-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Fix mixed leading whitespace
..

Fix mixed leading whitespace

Change-Id: I73b9b0ff6e3a6ec82782e2bd1437c180ce7c2423
---
M includes/JsonSchema.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/includes/JsonSchema.php b/includes/JsonSchema.php
index 5d65cd0..085ba8b 100644
--- a/includes/JsonSchema.php
+++ b/includes/JsonSchema.php
@@ -364,11 +364,11 @@
// additionalProperties can *either* be a boolean or 
can be
// defined as a schema (an object)
if ( gettype( $snode['additionalProperties'] ) == 
"boolean" ) {
-   if ( !$snode['additionalProperties'] ) {
-   $msg = JsonUtil::uiMessage( 
'jsonschema-invalidkey',
-   $key, 
$this->getDataPathTitles() );
-   throw new JsonSchemaException( $msg );
-   }
+   if ( !$snode['additionalProperties'] ) {
+   $msg = JsonUtil::uiMessage( 
'jsonschema-invalidkey',
+   
$key, $this->getDataPathTitles() );
+   throw new JsonSchemaException( $msg );
+   }
} else {
$schemadata = $snode['additionalProperties'];
$nodename = $key;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73b9b0ff6e3a6ec82782e2bd1437c180ce7c2423
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Use opt.addCorsOrigin instead of opt.isApiCall - change (mediawiki...Graph)

2016-07-20 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Use opt.addCorsOrigin instead of opt.isApiCall
..

Use opt.addCorsOrigin instead of opt.isApiCall

Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
---
M lib/graph2.compiled.js
M modules/graph2.js
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index a26a6bf..0389731 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -44,7 +44,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.
@@ -371,6 +371,7 @@
 urlParts.query = this.objExtender(urlParts.query, {format: 
'json', formatversion: '2'});
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikirest':
@@ -406,6 +407,7 @@
 };
 urlParts.pathname = '/w/api.php';
 urlParts.protocol = sanitizedHost.protocol;
+opt.addCorsOrigin = true;
 break;
 
 case 'wikifile':
diff --git a/modules/graph2.js b/modules/graph2.js
index 23dd211..f27a4b1 100644
--- a/modules/graph2.js
+++ b/modules/graph2.js
@@ -43,7 +43,7 @@
// but playing on the safer side.
opt.headers = { 'Treat-as-Untrusted': 1 
};
}
-   } else if ( opt.isApiCall ) {
+   } else if ( opt.addCorsOrigin ) {
// All CORS api calls require origin parameter.
// It would be better to use location.origin,
// but apparently it's not universal yet.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84f198f89a726f28b404016b1dfb2a854a1e8a13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
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] admin: add shell account for Jasmeet Samra - change (operations/puppet)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: admin: add shell account for Jasmeet Samra
..

admin: add shell account for Jasmeet Samra

Creates a shell user for Jasmeet Samra,
consultant for fundraising analytics (T139764)

UID matches wikitech LDAP user "jsamra"

Bug:T140445
Change-Id: Iad9e8a4a1fdf18f0381c902719947521a0a86d7d
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/300196/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ac72641..cd7a2a5 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1961,3 +1961,12 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDbRaAUzTfgxalgYGZ7ztelMGXC7vDJ4VwFtFlMt9IvApeYViRh+eIwcr2+94cwextv5fuFD/UWAhk38KKsEnr2SDu1BhTeqlXM1Tfibb8vfq5SrUXzANh61HgqAt9XIyWPXhOFGBJWGZKIHE9DJaDZn5xCmkwz+KPe0smxa0QLHgJTs/Z0sHYu5wcJYPQ/D+b1lBQAPHMUzCIDz8t6ctFysb/pPubX7kbnILao+Q60D7L85+6jgPx2mGFHfsv4LiZP80BhsbrLjwOpuILy3A8jS9aJ9WI0q6Yap9vuRXa8D0DNiymeoGo5X6ye0vdtfe4NZuV9eru3BWBjbSFmRwXP
 MJP@MJPwork.local
 uid: 15095
+  jksamra:
+ensure: present
+gid: 500
+name: jsamra
+realname: Jasmeet Samra
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQD2q9U+VYKkFz/WjwG0B+dF01CE4l8NZgBDXGU4AYXqxFk7Vuz2lWTEOeij4r8UgmSsdqq65yOfZYUtjYRm8iHdoIUufWar2XORcBCWqNMeRnId/XX9kMNefzhfl2z7j7UtiAVPsIJZQ0nSFwYY6AxrJdmpBOvinwz8X47FL955/ig4gZvvvV1qzBJ4pvx54U3/e7fwcMGpYrxCUoWuAgIYsc2OS9rW5meBln2bVlJjWRRcid5u9ZM9Za6Jqy/2OIrwhG2AzjpO+5RerflbiVAb6pP7cjU4t+4Cg8fzPTfXuwZ6sjEq6sWJkaz9BaQKC8LDC+nTugokNRlhNj/XxAe3
 jasmeetsamra@Jasmeets-MacBook.local
+uid: 15103
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9e8a4a1fdf18f0381c902719947521a0a86d7d
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] Labs: remove wmgUseApiFeatureUsage - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseApiFeatureUsage - matches prod
..

Labs: remove wmgUseApiFeatureUsage - matches prod

Change-Id: I89c012b06bf9503062cc2a9fd1b3be71c8b39a14
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c338b9f..5f3155b 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -493,10 +493,6 @@
'default' => 'deployment-cache-upload04.eqiad.wmflabs',
],
 
-   'wmgUseApiFeatureUsage' => [
-   'default' => true,
-   ],
-
'-wmgScorePath' => [
'default' => "//upload.beta.wmflabs.org/score",
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89c012b06bf9503062cc2a9fd1b3be71c8b39a14
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseCampaigns - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseCampaigns - matches prod
..

Labs: remove wmgUseCampaigns - matches prod

Change-Id: I8531d43355cc877ded103abfd414b05902f23bd3
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6ab4241..1144a83 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -354,10 +354,6 @@
'dewiki' => [ 'http://de.planet.wikimedia.org/atom.xml' 
],
],
 
-   'wmgUseCampaigns' => [
-   'default' => true,
-   ],
-
'wmgContentTranslationCluster' => [
'default' => false,
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8531d43355cc877ded103abfd414b05902f23bd3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseEventLogging - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseEventLogging - matches prod
..

Labs: remove wmgUseEventLogging - matches prod

Change-Id: I39e0ad30e6611ae5f77b7e9ed20aed298a771b4d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 29fbc5d..6ab4241 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -358,10 +358,6 @@
'default' => true,
],
 
-   'wmgUseEventLogging' => [
-   'default' => true,
-   ],
-
'wmgContentTranslationCluster' => [
'default' => false,
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39e0ad30e6611ae5f77b7e9ed20aed298a771b4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wgUploadThumbnailRenderMethod - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wgUploadThumbnailRenderMethod - matches prod
..

Labs: remove wgUploadThumbnailRenderMethod - matches prod

Change-Id: I4ae0bc79d5ce2f201ba7744a7603b49bc6787f2d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 5f3155b..3d6c17b 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -483,9 +483,6 @@
'wgUploadThumbnailRenderMap' => [
'default' => [ 320, 640, 800, 1024, 1280, 1920, 2560, 
2880 ],
],
-   'wgUploadThumbnailRenderMethod' => [
-   'default' => 'http',
-   ],
'wgUploadThumbnailRenderHttpCustomHost' => [
'default' => 'upload.beta.wmflabs.org',
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ae0bc79d5ce2f201ba7744a7603b49bc6787f2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseBounceHandler - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseBounceHandler - matches prod
..

Labs: remove wmgUseBounceHandler - matches prod

Change-Id: Ieda87c38330719c1d93d0dd23fc2c45c6721df34
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6a79ab0..c338b9f 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -497,10 +497,6 @@
'default' => true,
],
 
-   'wmgUseBounceHandler' => [
-   'default' => true,
-   ],
-
'-wmgScorePath' => [
'default' => "//upload.beta.wmflabs.org/score",
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieda87c38330719c1d93d0dd23fc2c45c6721df34
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseContentTranslation - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseContentTranslation - matches prod
..

Labs: remove wmgUseContentTranslation - matches prod

Change-Id: I070040f7677c36cda8284fbf23dab73f6f6a000c
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6bd4744..29fbc5d 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -446,11 +446,6 @@
'en_rtlwiki' => [ 'en-rtl' => 'English (rtl)' ],
],
 
-   'wmgUseContentTranslation' => [
-   'default' => false,
-   'wikipedia' => true,
-   ],
-
'wmgUsePetition' => [
'default' => false,
'metawiki' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I070040f7677c36cda8284fbf23dab73f6f6a000c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wgUploadThumbnailRenderMap - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wgUploadThumbnailRenderMap - matches prod
..

Labs: remove wgUploadThumbnailRenderMap - matches prod

Change-Id: I4394261ac871d7b8346cd8f2638a502d6dfad764
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 3d6c17b..deb5dca 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -479,10 +479,6 @@
'default' => 100,
],
 
-   // Thumbnail prerendering at upload time
-   'wgUploadThumbnailRenderMap' => [
-   'default' => [ 320, 640, 800, 1024, 1280, 1920, 2560, 
2880 ],
-   ],
'wgUploadThumbnailRenderHttpCustomHost' => [
'default' => 'upload.beta.wmflabs.org',
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4394261ac871d7b8346cd8f2638a502d6dfad764
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseEventBus - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseEventBus - matches prod
..

Labs: remove wmgUseEventBus - matches prod

Change-Id: Ib9b9ecaf1d4d892f040e98b0b5048369c47b9a89
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index deb5dca..6bd4744 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -467,10 +467,6 @@
'default' => 
'http://c357be0613e24340a96aeaa28dde0...@sentry-beta.wmflabs.org/4',
],
 
-   'wmgUseEventBus' => [
-   'default' => true,
-   ],
-
// Thumbnail chaining
'wgThumbnailBuckets' => [
'default' => [ 2880 ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b9ecaf1d4d892f040e98b0b5048369c47b9a89
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wgRCWatchCategoryMembership - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Labs: remove wgRCWatchCategoryMembership - matches prod
..


Labs: remove wgRCWatchCategoryMembership - matches prod

Change-Id: Iab38f06991c612f8f84384468f4736b952b49276
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 3cc1162..c62ead3 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -218,10 +218,6 @@
'default' => true,
],
 
-   'wgRCWatchCategoryMembership' => [
-   'default' => true,
-   ],
-
// T39852
'wmgUseWikimediaShopLink' => [
'default'=> false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab38f06991c612f8f84384468f4736b952b49276
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgLogAuthmanagerMetrics - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgLogAuthmanagerMetrics - matches prod
..

Labs: remove wmgLogAuthmanagerMetrics - matches prod

Change-Id: I4c71beba1e0debcf8833fb54472626632f02f629
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 1b52b04..6a79ab0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -528,10 +528,6 @@
'default' => false,
],
 
-   'wmgLogAuthmanagerMetrics' => [
-   'default' => true,
-   ],
-
'wmgMediaViewerUseThumbnailGuessing' => [
'default' => false, // T69651
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c71beba1e0debcf8833fb54472626632f02f629
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseUrlShortener - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseUrlShortener - matches prod
..

Labs: remove wmgUseUrlShortener - matches prod

Change-Id: I90518031e9b57e2f9ab4ec16fef450abbdc9c20f
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index fe80494..1b52b04 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -536,11 +536,6 @@
'default' => false, // T69651
],
 
-   'wmgUseUrlShortener' => [
-   'default' => true,
-   'private' => false,
-   ],
-
'wmgUseArticlePlaceholder' => [
'default' => false,
'wikidataclient' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90518031e9b57e2f9ab4ec16fef450abbdc9c20f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgCirrusSearchUseCompletionSuggester - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgCirrusSearchUseCompletionSuggester
..

Labs: remove wmgCirrusSearchUseCompletionSuggester

Matches prod

Change-Id: Ia72e59188ed8b98d2e055a90641b9ff560b0d481
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index ed90e4a..fe80494 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -572,12 +572,6 @@
'default' => [],
'enwiki' => [ 0 => true ],
],
-   // Test completion suggester default everywhere in preperation
-   // for rollout to production
-   'wmgCirrusSearchUseCompletionSuggester' => [
-   'default' => 'yes',
-   'wikidatawiki' => 'no',
-   ],
 
'wmgWikibaseAllowDataAccessInUserLanguage' => [
'default' => false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia72e59188ed8b98d2e055a90641b9ff560b0d481
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseOATHAuth - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wmgUseOATHAuth - matches prod
..

Labs: remove wmgUseOATHAuth - matches prod

Change-Id: I24fa01b8977ceda9d716a43c53f8b571d41feacd
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 075a538..ed90e4a 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -605,11 +605,6 @@
'default' => true,  // T134770
],
 
-   // Test enabling OATH for 2FA
-   'wmgUseOATHAuth' => [
-   'default' => true,
-   ],
-
// Ensure ?action=credits isn't break and allow to work
// to cache this information. See T130820.
'wgMaxCredits' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24fa01b8977ceda9d716a43c53f8b571d41feacd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wgDisableAuthManager - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Labs: remove wgDisableAuthManager - matches prod
..

Labs: remove wgDisableAuthManager - matches prod

Change-Id: I98ed26c155ec885b43ffcab825da412f634a46ac
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c012427..075a538 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -616,11 +616,6 @@
'default' => -1,
],
 
-   // test enabling AuthManager T135498, T135504
-   'wgDisableAuthManager' => [
-   'default' => false,
-   ],
-
// Test PageAssessments. See T125551.
'wmgUsePageAssessments' => [
'default' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ed26c155ec885b43ffcab825da412f634a46ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgGeoDataDebug - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Labs: remove wmgGeoDataDebug - matches prod
..


Labs: remove wmgGeoDataDebug - matches prod

Change-Id: I21176f7f5552e03d80e8633459a18d1fcc6120a0
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 384e847..cc96713 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -276,10 +276,6 @@
]
],
 
-   'wmgGeoDataDebug' => [
-   'default' => true,
-   ],
-
'wmgULSPosition' => [
# Beta-specific
'deploymentwiki' => 'personal',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21176f7f5552e03d80e8633459a18d1fcc6120a0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgUseCodeEditorForCore - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Labs: remove wmgUseCodeEditorForCore - matches prod
..


Labs: remove wmgUseCodeEditorForCore - matches prod

Change-Id: Id4ea70a21251d01d37e0b7582eae32914072162e
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index cc96713..c012427 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -281,12 +281,6 @@
'deploymentwiki' => 'personal',
],
 
-   // (T41653) The plan is to enable it for testing on labs first, 
so add
-   // the config hook to be able to do that.
-   'wmgUseCodeEditorForCore' => [
-   'default' => true,
-   ],
-
'wmgUseCommonsMetadata' => [
'default' => true,
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4ea70a21251d01d37e0b7582eae32914072162e
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgEnableGeoData - matches prod now - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Labs: remove wmgEnableGeoData - matches prod now
..


Labs: remove wmgEnableGeoData - matches prod now

Change-Id: I87a20080872c5c462abcca2f1a057606d45ee3a5
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c3cc091..384e847 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -276,9 +276,6 @@
]
],
 
-   'wmgEnableGeoData' => [
-   'wikidatawiki' => true,
-   ],
'wmgGeoDataDebug' => [
'default' => true,
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87a20080872c5c462abcca2f1a057606d45ee3a5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: remove wmgMFUseCentralAuthToken - matches prod - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Labs: remove wmgMFUseCentralAuthToken - matches prod
..


Labs: remove wmgMFUseCentralAuthToken - matches prod

Change-Id: Ic8fa32e08fa7e98b5526449cfac5bd4096de5610
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index e1d5a41..c3cc091 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -261,9 +261,6 @@
'wmgMFPhotoUploadEndpoint' => [
'default' => 
'http://commons.wikimedia.$variant.wmflabs.org/w/api.php',
],
-   'wmgMFUseCentralAuthToken' => [
-   'default' => true,
-   ],
'wmgMFSpecialCaseMainPage' => [
'default' => true,
'enwiki' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8fa32e08fa7e98b5526449cfac5bd4096de5610
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove wgMFEnableBetaDiff, unused - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Remove wgMFEnableBetaDiff, unused
..


Remove wgMFEnableBetaDiff, unused

Change-Id: I43c69397475a79cb3cf4ccb045766e82c3912e66
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c62ead3..e1d5a41 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -264,9 +264,6 @@
'wmgMFUseCentralAuthToken' => [
'default' => true,
],
-   'wmgMFEnableBetaDiff' => [
-   'default' => true,
-   ],
'wmgMFSpecialCaseMainPage' => [
'default' => true,
'enwiki' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43c69397475a79cb3cf4ccb045766e82c3912e66
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove wmgUseContributionReporting, unused - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Remove wmgUseContributionReporting, unused
..


Remove wmgUseContributionReporting, unused

Change-Id: Ie156f179db82a25e35057466ae3dd00e71fe1bd0
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 18e10c3..3cc1162 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -208,9 +208,6 @@
'-wgUseContributionTracking' => [
'default' => false,
],
-   '-wmgUseContributionReporting' => [
-   'default' => false,
-   ],
 
# To help fight spam, makes rules maintained on deploymentwiki
# to be available on all beta wikis.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie156f179db82a25e35057466ae3dd00e71fe1bd0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Initialize configuration for tcy.wikipedia - change (operations/mediawiki-config)

2016-07-20 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Initialize configuration for tcy.wikipedia
..

Initialize configuration for tcy.wikipedia

•Add tcywiki (Tulu) to langlist.
•Specific database lists: all, s3, small, wikipedia, commonsupload
•Features database lists: flow, visualeditor-default, wikidataclient,
securepollglobal
•Timzone: Asia/Kolkata (from PHP docs)
•Project name: "ವಿಕಿಪೀಡಿಯ" (from Incubator)
•Logos from
https://commons.wikimedia.org/wiki/File:Wikipedia-logo-v2-tcy.svg
•Namespaces

Bug: T140898
Change-Id: I3ddfc12efff0911b547ac93ab31c92d49447b224
---
M dblists/all.dblist
M dblists/commonsuploads.dblist
M dblists/flow.dblist
M dblists/s3.dblist
M dblists/securepollglobal.dblist
M dblists/small.dblist
M dblists/visualeditor-nondefault.dblist
M dblists/wikidataclient.dblist
M dblists/wikipedia.dblist
M langlist
M wikiversions.json
M wmf-config/InitialiseSettings.php
12 files changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/dblists/all.dblist b/dblists/all.dblist
index 73983e3..da4ca76 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -743,6 +743,7 @@
 tawikiquote
 tawikisource
 tawiktionary
+tcywiki
 tenwiki
 test2wiki
 testwiki
diff --git a/dblists/commonsuploads.dblist b/dblists/commonsuploads.dblist
index becdb5f..776fec7 100644
--- a/dblists/commonsuploads.dblist
+++ b/dblists/commonsuploads.dblist
@@ -459,6 +459,7 @@
 tawikiquote
 tawikisource
 tawiktionary
+tcywiki
 tetwiki
 tewikibooks
 tewikiquote
diff --git a/dblists/flow.dblist b/dblists/flow.dblist
index 6969635..616d446 100644
--- a/dblists/flow.dblist
+++ b/dblists/flow.dblist
@@ -706,6 +706,7 @@
 tawikiquote
 tawikisource
 tawiktionary
+tcywiki
 tenwiki
 test2wiki
 testwiki
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index c3da488..9022fd3 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -711,6 +711,7 @@
 tawikiquote
 tawikisource
 tawiktionary
+tcywiki
 tenwiki
 test2wiki
 testwiki
diff --git a/dblists/securepollglobal.dblist b/dblists/securepollglobal.dblist
index 18db14e..6a724f4 100644
--- a/dblists/securepollglobal.dblist
+++ b/dblists/securepollglobal.dblist
@@ -740,6 +740,7 @@
 tawikiquote
 tawikisource
 tawiktionary
+tcywiki
 tenwiki
 test2wiki
 testwiki
diff --git a/dblists/small.dblist b/dblists/small.dblist
index 38f03d4..cba3529 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -415,6 +415,7 @@
 tawikibooks
 tawikiquote
 tawikisource
+tcywiki
 tenwiki
 testwikidatawiki
 tetwiki
diff --git a/dblists/visualeditor-nondefault.dblist 
b/dblists/visualeditor-nondefault.dblist
index b81e1db..40cb4a2 100644
--- a/dblists/visualeditor-nondefault.dblist
+++ b/dblists/visualeditor-nondefault.dblist
@@ -46,6 +46,7 @@
 siwiki
 srwiki
 tawiki
+tcywiki
 tetwiki
 tewiki
 tgwiki
diff --git a/dblists/wikidataclient.dblist b/dblists/wikidataclient.dblist
index b264463..e302dd7 100644
--- a/dblists/wikidataclient.dblist
+++ b/dblists/wikidataclient.dblist
@@ -540,6 +540,7 @@
 tawikinews
 tawikiquote
 tawikisource
+tcywiki
 test2wiki
 testwiki
 testwikidatawiki
diff --git a/dblists/wikipedia.dblist b/dblists/wikipedia.dblist
index 7173b1a..2b266d6 100644
--- a/dblists/wikipedia.dblist
+++ b/dblists/wikipedia.dblist
@@ -251,6 +251,7 @@
 swwiki
 szlwiki
 tawiki
+tcywiki
 tenwiki
 testwiki
 test2wiki
diff --git a/langlist b/langlist
index 1d4b3dd..b9c68c9 100644
--- a/langlist
+++ b/langlist
@@ -247,6 +247,7 @@
 sw
 szl
 ta
+tcy
 te
 tet
 tg
diff --git a/wikiversions.json b/wikiversions.json
index 249563a..b7e0029 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -744,6 +744,7 @@
 "tawikiquote": "php-1.28.0-wmf.11",
 "tawikisource": "php-1.28.0-wmf.11",
 "tawiktionary": "php-1.28.0-wmf.11",
+"tcywiki": "php-1.28.0-wmf11",
 "tenwiki": "php-1.28.0-wmf.10",
 "test2wiki": "php-1.28.0-wmf.11",
 "testwiki": "php-1.28.0-wmf.11",
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8bd4df9..a66f6f3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -431,6 +431,7 @@
'svwikiversity' => 'Europe/Berlin',
'svwikivoyage' => 'Europe/Stockholm', // T43992
'szlwiki' => 'Europe/Warsaw',
+   'tcywiki' => 'Asia/Kolkata',
'thwiki' => 'Asia/Bangkok',
'thwikibooks' => 'Asia/Bangkok',
'thwikisource' => 'Asia/Bangkok',
@@ -703,6 +704,7 @@
'swwiki' => '/static/images/project-logos/swwiki.png',
'szlwiki' => '/static/images/project-logos/szlwiki.png',
'tawiki' => '/static/images/project-logos/tawiki.png',  // T29826
+   'tcywiki' => '/static/images/project-logos/tcywiki.png', // T140898
'tewiki' => '/static/images/project-logos/tewiki.png',
'tetwiki' => '/static/images/project-logos/tetwiki.png',  //

[MediaWiki-commits] [Gerrit] ORES score edits in main and Property namespaces in wikidata... - change (operations/mediawiki-config)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: ORES score edits in main and Property namespaces in wikidatawiki
..


ORES score edits in main and Property namespaces in wikidatawiki

Bug: T139660
Change-Id: Ica58f2894223ae519fa0e04e3fa6bd6781ddb7e7
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8bd4df9..f81ee6b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16917,6 +16917,10 @@
'ptwiki' => [ 'hard' => 0.22, 'soft' => 0.48 ], // T139692
'trwiki' => [ 'hard' => 0.22, 'soft' => 0.49 ], // T139992
 ],
+'wgOresEnabledNamespaces' => [
+   'default' => [],
+   'wikidatawiki' => [ 0 => true, 120 => true ], // T139660
+],
 ### End (roughly) of general extensions 
 
 'wgUseTidy' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica58f2894223ae519fa0e04e3fa6bd6781ddb7e7
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
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 rev_by_bot flag to revision_create event. - change (mediawiki...EventBus)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Add rev_by_bot flag to revision_create event.
..


Add rev_by_bot flag to revision_create event.

For ORES caching updates we need to filter out all of the edits
made by bots. So, we need to add this information to the event.

Change-Id: Id387c99c1d18414cca1ccd0f7213e247cb4490b8
---
M EventBus.hooks.php
M extension.json
2 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index 81f1f31..7752729 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -109,6 +109,7 @@
$attrs['user_id'] = $revision->getUser();
$attrs['user_text'] = $revision->getUserText();
$attrs['comment'] = $revision->getComment();
+   $attrs['rev_by_bot'] = (bool) ( $flags & EDIT_FORCE_BOT );
 
// The parent_revision_id attribute is not required, but when 
supplied
// must have a minimum value of 1, so omit it entirely when 
there is no
@@ -347,7 +348,6 @@
$event = self::createEvent( self::getUserPageURL( $user_blocked 
),
'mediawiki.user_block', $attrs );
 
-   wfDebug( 'USER_URL' . json_encode( $event ) );
DeferredUpdates::addCallableUpdate( function() use ( $event ) {
EventBus::getInstance()->send( [ $event ] );
} );
diff --git a/extension.json b/extension.json
index eed6258..821c0ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,8 +1,9 @@
 {
"name": "EventBus",
-   "version": "0.2.8",
+   "version": "0.2.9",
"author": [
-   "Eric Evans"
+   "Eric Evans",
+   "Petr Pchelko"
],
"url": "https://www.mediawiki.org/wiki/Extension:EventBus;,
"descriptionmsg": "eventbus-desc",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id387c99c1d18414cca1ccd0f7213e247cb4490b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.10
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Deploy - change (wikimedia...dashboard)

2016-07-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Deploy
..


Deploy

Bug: T139548
Change-Id: I83e98464aa22a78addf8ce867382c77c38c838df
---
M shiny-server/metrics
M shiny-server/portal
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/shiny-server/metrics b/shiny-server/metrics
index f382642..a824cba 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit f382642bbc3b67077cbd35fa02b7c1dec941c2f8
+Subproject commit a824cbaf663e3019287cb3ef509729d748143be5
diff --git a/shiny-server/portal b/shiny-server/portal
index bb3f2fa..642c175 16
--- a/shiny-server/portal
+++ b/shiny-server/portal
-Subproject commit bb3f2fa5f8c5a55a8ea11a101fb1554809a38e77
+Subproject commit 642c175655192e426dc3ed31fac01c1f5fbf9528

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83e98464aa22a78addf8ce867382c77c38c838df
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Deploy - change (wikimedia...dashboard)

2016-07-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Deploy
..

Deploy

Bug: T139548
Change-Id: I83e98464aa22a78addf8ce867382c77c38c838df
---
M shiny-server/metrics
M shiny-server/portal
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/81/300181/1

diff --git a/shiny-server/metrics b/shiny-server/metrics
index f382642..a824cba 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit f382642bbc3b67077cbd35fa02b7c1dec941c2f8
+Subproject commit a824cbaf663e3019287cb3ef509729d748143be5
diff --git a/shiny-server/portal b/shiny-server/portal
index bb3f2fa..642c175 16
--- a/shiny-server/portal
+++ b/shiny-server/portal
-Subproject commit bb3f2fa5f8c5a55a8ea11a101fb1554809a38e77
+Subproject commit 642c175655192e426dc3ed31fac01c1f5fbf9528

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83e98464aa22a78addf8ce867382c77c38c838df
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add rev_by_bot flag to revision_create event. - change (mediawiki...EventBus)

2016-07-20 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review.

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

Change subject: Add rev_by_bot flag to revision_create event.
..

Add rev_by_bot flag to revision_create event.

For ORES caching updates we need to filter out all of the edits
made by bots. So, we need to add this information to the event.

Change-Id: Id387c99c1d18414cca1ccd0f7213e247cb4490b8
---
M EventBus.hooks.php
M extension.json
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/80/300180/1

diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index 81f1f31..7752729 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -109,6 +109,7 @@
$attrs['user_id'] = $revision->getUser();
$attrs['user_text'] = $revision->getUserText();
$attrs['comment'] = $revision->getComment();
+   $attrs['rev_by_bot'] = (bool) ( $flags & EDIT_FORCE_BOT );
 
// The parent_revision_id attribute is not required, but when 
supplied
// must have a minimum value of 1, so omit it entirely when 
there is no
@@ -347,7 +348,6 @@
$event = self::createEvent( self::getUserPageURL( $user_blocked 
),
'mediawiki.user_block', $attrs );
 
-   wfDebug( 'USER_URL' . json_encode( $event ) );
DeferredUpdates::addCallableUpdate( function() use ( $event ) {
EventBus::getInstance()->send( [ $event ] );
} );
diff --git a/extension.json b/extension.json
index eed6258..821c0ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,8 +1,9 @@
 {
"name": "EventBus",
-   "version": "0.2.8",
+   "version": "0.2.9",
"author": [
-   "Eric Evans"
+   "Eric Evans",
+   "Petr Pchelko"
],
"url": "https://www.mediawiki.org/wiki/Extension:EventBus;,
"descriptionmsg": "eventbus-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id387c99c1d18414cca1ccd0f7213e247cb4490b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.10
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] Let ORES extension score for some namespaces instead of all - change (mediawiki...ORES)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Let ORES extension score for some namespaces instead of all
..


Let ORES extension score for some namespaces instead of all

It will be useful in case of Wikidata

Bug: T139660
Change-Id: I812b9c1afd2d4e98fb3d19a8cfb04133998dd4e6
---
M extension.json
M includes/Hooks.php
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 744df41..ebdccb5 100644
--- a/extension.json
+++ b/extension.json
@@ -83,6 +83,7 @@
"hard": 0.50
},
"OresDamagingDefault": "hard",
+   "OresEnabledNamespaces": {},
"OresWikiId": null,
"RecentChangesFlags": {
"damaging": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 2cfc25d..4d13902 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -32,10 +32,19 @@
 * Ask the ORES server for scores on this recent change
 */
public static function onRecentChange_save( RecentChange $rc ) {
-   global $wgOresExcludeBots;
+   global $wgOresExcludeBots, $wgOresEnabledNamespaces;
if ( $rc->getAttribute( 'rc_bot' ) && $wgOresExcludeBots ) {
return true;
}
+
+   // Check if we actually want score for this namespace
+   $ns = $rc->getAttribute( 'rc_namespace' );
+   if ( $wgOresEnabledNamespaces &&
+   !( isset( $wgOresEnabledNamespaces[$ns] ) &&
+   $wgOresEnabledNamespaces[$ns] ) ) {
+   return true;
+   }
+
$rc_type = $rc->getAttribute( 'rc_type' );
if ( $rc_type === RC_EDIT || $rc_type === RC_NEW ) {
$revid = $rc->getAttribute( 'rc_this_oldid' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I812b9c1afd2d4e98fb3d19a8cfb04133998dd4e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.28.0-wmf.11
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WIP] Centralize document and namespace id generation - change (mediawiki...CirrusSearch)

2016-07-20 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: [WIP] Centralize document and namespace id generation
..

[WIP] Centralize document and namespace id generation

To support multi-project indices we have to make sure document id's
don't overlap between projects. The main idea for this is to prefix
all ids with the wiki name, so the document 12 becomes testwiki:12.
Internal to elasticsearch id's are already treated as strings so
nothing needs to change there.

This patch doesn't go all the way yet, but tries to track down all the
places we deal with id's and classify them as document ids or page ids.
All the places page id's need to be converted to pageId's they pass
through SearchConfig::makeId().

Will likely need to make some adjustments to cindy to properly test
this. With the obvious difference between the two, it may be necessary
to have cindy run all the tests twice, once in the standard
configuration and once in the multi-project index configuration. That
kinda sucks though :S

Bug: T139496
Change-Id: I5f1aa56645f7ff88649e4238ca6d0af551c858c3
---
M CirrusSearch.php
M includes/BuildDocument/SuggestBuilder.php
M includes/CompletionSuggester.php
M includes/Connection.php
M includes/DataSender.php
M includes/Dump.php
M includes/ElasticsearchIntermediary.php
M includes/Hooks.php
M includes/Job/CheckerJob.php
M includes/Job/DeletePages.php
M includes/Job/Job.php
M includes/Maintenance/ChunkBuilder.php
M includes/Maintenance/Reindexer.php
M includes/OtherIndexes.php
M includes/Sanity/Checker.php
M includes/Sanity/QueueingRemediator.php
M includes/Sanity/Remediator.php
M includes/Search/Filters.php
M includes/Search/SearchContext.php
M includes/SearchConfig.php
M includes/Searcher.php
M includes/Updater.php
M includes/Util.php
M maintenance/copySearchIndex.php
M maintenance/forceSearchIndex.php
M maintenance/indexNamespaces.php
M maintenance/runSearch.php
M maintenance/saneitize.php
M maintenance/saneitizeJobs.php
M maintenance/updateOneSearchIndexConfig.php
M maintenance/updateSuggesterIndex.php
31 files changed, 343 insertions(+), 200 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 5a041b1..c516d5f 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -902,6 +902,15 @@
  */
 $wgCirrusSearchIndexBaseName = wfWikiID();
 
+/**
+ * Either null, to have no prefix, or a string indicating the prefix
+ * to use for all page and namespace document id's in elasticsearch. This
+ * is necessary if multiple wiki's will be sharing a single index.
+ *
+ * EXPERIMENTAL: Setting this to anything other than null is probably broken.
+ */
+$wgCirrusSearchDocIdPrefix = null;
+
 $includes = __DIR__ . "/includes/";
 $apiDir = $includes . 'Api/';
 $buildDocument = $includes . 'BuildDocument/';
diff --git a/includes/BuildDocument/SuggestBuilder.php 
b/includes/BuildDocument/SuggestBuilder.php
index 94c7fac..2181318 100644
--- a/includes/BuildDocument/SuggestBuilder.php
+++ b/includes/BuildDocument/SuggestBuilder.php
@@ -113,7 +113,7 @@
$docs = array();
foreach ( $inputDocs as $sourceDoc ) {
$inputDoc = $sourceDoc['source'];
-   $id = $sourceDoc['id'];
+   $docId = $sourceDoc['id'];
if ( !isset( $inputDoc['namespace'] ) ) {
// Bad doc, nothing to do here.
continue;
@@ -123,7 +123,7 @@
// Bad doc, nothing to do here.
continue;
}
-   $docs = array_merge( $docs, 
$this->buildNormalSuggestions( $id, $inputDoc ) );
+   $docs = array_merge( $docs, 
$this->buildNormalSuggestions( $docId, $inputDoc ) );
} else {
if ( !isset( $inputDoc['redirect'] ) ) {
// Bad doc, nothing to do here.
@@ -181,11 +181,11 @@
/**
 * Build classic suggestion
 *
-* @param int $id
+* @param int $docId
 * @param array $inputDoc
 * @return \Elastica\Document[] a set of suggest documents
 */
-   private function buildNormalSuggestions( $id, array $inputDoc ) {
+   private function buildNormalSuggestions( $docId, array $inputDoc ) {
if ( !isset( $inputDoc['title'] ) ) {
// Bad doc, nothing to do here.
return array();
@@ -197,9 +197,9 @@
$location = $this->findPrimaryCoordinates( $inputDoc );
 
$suggestions = $this->extractTitleAndSimilarRedirects( 
$inputDoc );
-   $docs[] =

[MediaWiki-commits] [Gerrit] Add option to hide >15% countries - change (wikimedia...prince)

2016-07-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Add option to hide >15% countries
..

Add option to hide >15% countries

Bug: T139548
Change-Id: Ic8082aa2112764be335fe0ac68f5f4e259b1bd33
---
M server.R
M ui.R
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/prince 
refs/changes/78/300178/1

diff --git a/server.R b/server.R
index 8d8ceab..774a145 100644
--- a/server.R
+++ b/server.R
@@ -76,6 +76,11 @@
 return(replace(y, y < 5, NA))
   })
 }
+if (input$hide_more_than_15) {
+  temp[, -1] <- apply(temp[, -1], 2, function(y) {
+return(replace(y, y > 15, NA))
+  })
+}
 temp %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_country_breakdown)) %>%
   { .[, apply(., 2, function(y) { return(sum(!is.na(y))) }) > 0] } %>%
diff --git a/ui.R b/ui.R
index 9dcd3dd..ed8068e 100644
--- a/ui.R
+++ b/ui.R
@@ -64,8 +64,9 @@
 ),
 tabItem(tabName = "country_breakdown",
 
fluidRow(column(polloi::smooth_select("smoothing_country_breakdown"), width = 
4),
- column(checkboxInput("group_us_regions", "Group U.S. 
regions", value = FALSE), width = 4),
- column(checkboxInput("hide_less_than_5", "Hide countries 
with <5% traffic share", value = FALSE), width = 4)),
+ column(checkboxInput("group_us_regions", "Group U.S. 
regions", value = FALSE), width = 2),
+ column(checkboxInput("hide_less_than_5", "Hide countries 
with <5% traffic share", value = FALSE), width = 2),
+ column(checkboxInput("hide_more_than_15", "Hide countries 
with >15% traffic share", value = FALSE), width = 2)),
 div(dygraphOutput("country_breakdown_dygraph"),
 div(id = "country_breakdown_legend",
 style = "height: 60px; padding-top: 30px; padding-left: 
20px;"),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8082aa2112764be335fe0ac68f5f4e259b1bd33
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/prince
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add option to hide >15% countries - change (wikimedia...prince)

2016-07-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Add option to hide >15% countries
..


Add option to hide >15% countries

Bug: T139548
Change-Id: Ic8082aa2112764be335fe0ac68f5f4e259b1bd33
---
M server.R
M ui.R
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/server.R b/server.R
index 8d8ceab..774a145 100644
--- a/server.R
+++ b/server.R
@@ -76,6 +76,11 @@
 return(replace(y, y < 5, NA))
   })
 }
+if (input$hide_more_than_15) {
+  temp[, -1] <- apply(temp[, -1], 2, function(y) {
+return(replace(y, y > 15, NA))
+  })
+}
 temp %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_country_breakdown)) %>%
   { .[, apply(., 2, function(y) { return(sum(!is.na(y))) }) > 0] } %>%
diff --git a/ui.R b/ui.R
index 9dcd3dd..ed8068e 100644
--- a/ui.R
+++ b/ui.R
@@ -64,8 +64,9 @@
 ),
 tabItem(tabName = "country_breakdown",
 
fluidRow(column(polloi::smooth_select("smoothing_country_breakdown"), width = 
4),
- column(checkboxInput("group_us_regions", "Group U.S. 
regions", value = FALSE), width = 4),
- column(checkboxInput("hide_less_than_5", "Hide countries 
with <5% traffic share", value = FALSE), width = 4)),
+ column(checkboxInput("group_us_regions", "Group U.S. 
regions", value = FALSE), width = 2),
+ column(checkboxInput("hide_less_than_5", "Hide countries 
with <5% traffic share", value = FALSE), width = 2),
+ column(checkboxInput("hide_more_than_15", "Hide countries 
with >15% traffic share", value = FALSE), width = 2)),
 div(dygraphOutput("country_breakdown_dygraph"),
 div(id = "country_breakdown_legend",
 style = "height: 60px; padding-top: 30px; padding-left: 
20px;"),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8082aa2112764be335fe0ac68f5f4e259b1bd33
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/prince
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Parsoid: Move to service::node - change (mediawiki/vagrant)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Parsoid: Move to service::node
..


Parsoid: Move to service::node

Parsoid now relies on service-runner, so we can make it use
service::node in MW-Vagrant. Also, clean up the old, now unused
manifests and templates.

Bug: T140477
Change-Id: If1f74f54c161d3c705ec84e80a9c21588cf7d279
---
M puppet/hieradata/common.yaml
D puppet/modules/mediawiki/manifests/parsoid.pp
D puppet/modules/mediawiki/templates/parsoid.conf.erb
A puppet/modules/parsoid/manifests/init.pp
R puppet/modules/parsoid/templates/localsettings.js.erb
M puppet/modules/restbase/templates/config.yaml.erb
M puppet/modules/role/manifests/iegreview.pp
M puppet/modules/role/manifests/parsoid.pp
M puppet/modules/role/templates/flow/conf.php.erb
M puppet/modules/role/templates/parsoid/vrs.php.erb
M puppet/modules/role/templates/visualeditor/conf.php.erb
M puppet/modules/service/manifests/node.pp
M puppet/modules/service/templates/node/config.yaml.erb
M puppet/modules/service/templates/node/upstart.conf.erb
14 files changed, 113 insertions(+), 118 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 38dd04f..2047b25 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -33,7 +33,7 @@
 
 contenttranslation::dir: 
"%{hiera('mediawiki::dir')}/extensions/ContentTranslation"
 contenttranslation::cxserver::dir: "%{hiera('mwv::services_dir')}/cxserver"
-contenttranslation::parsoid_url: 
"http://127.0.0.1:%{::mediawiki::parsoid::port};
+contenttranslation::parsoid_url: "http://127.0.0.1:%{::parsoid::port};
 contenttranslation::parsoid_timeout: 10
 contenttranslation::parsoid_prefix: 'enwiki'
 contenttranslation::view_template: 
"//$1%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/wiki/$2"
@@ -60,7 +60,7 @@
 contenttranslation::cxserver::proxy: 'null'
 contenttranslation::cxserver::log: /vagrant/logs
 contenttranslation::cxserver::allow_cors: '*'
-contenttranslation::cxserver::parsoid: 
"http://127.0.0.1:%{::mediawiki::parsoid::port};
+contenttranslation::cxserver::parsoid: "http://127.0.0.1:%{::parsoid::port};
 contenttranslation::cxserver::apertium: 'http://apertium.wmflabs.org'
 contenttranslation::cxserver::yandex: 'https://translate.yandex.net'
 contenttranslation::cxserver::yandex_key: 'null'
@@ -232,7 +232,7 @@
 iegreview::cache_dir: /var/cache/iegreview
 iegreview::log_file: /vagrant/logs/iegreview.log
 iegreview::smtp_server: 127.0.0.1
-iegreview::parsoid_url: 
"http://127.0.0.1:%{::mediawiki::parsoid::port}/localhost/;
+iegreview::parsoid_url: "http://127.0.0.1:%{::parsoid::port}/localhost/;
 
 mediawiki::wiki_name: devwiki
 mediawiki::dir: /vagrant/mediawiki
@@ -274,14 +274,12 @@
 mediawiki::mwrepl::default_db_name: "%{hiera('mediawiki::db_name')}"
 mediawiki::mwrepl::script_dir: "%{hiera('mediawiki::multiwiki::script_dir')}"
 
-mediawiki::parsoid::dir: "%{hiera('mwv::services_dir')}/parsoid"
-mediawiki::parsoid::port: 8000
-mediawiki::parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
-mediawiki::parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
-mediawiki::parsoid::use_php_preprocessor: true
-mediawiki::parsoid::use_selser: true
-mediawiki::parsoid::allow_cors: '*'
-mediawiki::parsoid::workers: 2
+parsoid::port: 8000
+parsoid::domain: "%{hiera('role::mediawiki::hostname')}"
+parsoid::uri: "http://localhost%{::port_fragment}/w/api.php;
+parsoid::use_php_preprocessor: true
+parsoid::use_selser: true
+parsoid::allow_cors: '*'
 
 mysql::host: '127.0.0.1'
 mysql::default_db_name: wiki
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp 
b/puppet/modules/mediawiki/manifests/parsoid.pp
deleted file mode 100644
index 830d262..000
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-# == Class: mediawiki::parsoid
-#
-# Parsoid is a wiki runtime which can translate back and forth between
-# MediaWiki's wikitext syntax and an equivalent HTML / RDFa document model with
-# better support for automated processing and visual editing. Its main user
-# currently is the visual editor project.
-#
-# === Parameters
-#
-# [*dir*]
-#   Install Parsoid to this directory.
-#
-# [*port*]
-#   The Parsoid web service will listen on this port.
-#
-# [*domain*]
-#   The MediaWiki host domain name.
-#
-# [*uri*]
-#   The full URI to the MediaWiki api.php to use.
-#
-# [*use_php_preprocessor*]
-#   If true, use the PHP pre-processor to expand templates via the
-#   MediaWiki API.
-#
-# [*use_selser*]
-#   Use selective serialization.
-#
-# [*allow_cors*]
-#   Domains that should be permitted to make cross-domain requests.
-#   If false or undefined, disables CORS.
-#
-# [*workers*]
-#   Number of worker processes to fork.
-#
-class mediawiki::parsoid(
-$dir,
-$port,
-$domain,
-$uri,
-

[MediaWiki-commits] [Gerrit] Allow requesting TS_ISO_8601 for ApiEchoMarkSeen, and deprec... - change (mediawiki...Echo)

2016-07-20 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Allow requesting TS_ISO_8601 for ApiEchoMarkSeen, and deprecate 
TS_MW
..

Allow requesting TS_ISO_8601 for ApiEchoMarkSeen, and deprecate TS_MW

(Previously TS_MW was the only possibility).

Per https://www.mediawiki.org/wiki/API:Data_formats#Timestamps

Bug: T139993
Change-Id: Ief9a720a5053ee153b84edb64524aa4743cc76f1
---
M i18n/en.json
M i18n/qqq.json
M includes/SeenTime.php
M includes/api/ApiEchoMarkSeen.php
4 files changed, 27 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index c8ba41a..c53535f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -222,6 +222,7 @@
"apihelp-echomarkseen-description": "Mark notifications as seen for the 
current user.",
"apihelp-echomarkseen-example-1": "Mark notifications of all types as 
seen",
"apihelp-echomarkseen-param-type": "Type of notifications to mark as 
seen: 'alert', 'message' or 'all'.",
+   "apihelp-echomarkseen-param-timestampFormat": "Timestamp format to use 
for output, 'ISO_8601' or 'MW'.  'MW' is deprecated here, so all clients should 
switch to 'ISO_8601'.  This parameter will be removed, and 'ISO_8601' will 
become the only output format.",
"apihelp-query+notifications-description": "Get notifications waiting 
for the current user.",
"apihelp-query+notifications-param-prop": "Details to request.",
"apihelp-query+notifications-param-sections": "The notification 
sections to query (i.e. some combination of 'alert' and 'message').",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 399c4d8..9b5c2de 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -214,6 +214,7 @@
"apihelp-echomarkseen-description": 
"{{doc-apihelp-description|echomarkseen}}",
"apihelp-echomarkseen-example-1": 
"{{doc-apihelp-example|echomarkseen}}",
"apihelp-echomarkseen-param-type": 
"{{doc-apihelp-param|query+notifications|type}} Do not translate the quoted 
strings.",
+   "apihelp-echomarkseen-param-timestampFormat": 
"{{doc-apihelp-param|query+notifications|timestampFormat}} Do not translate the 
quoted strings.",
"apihelp-query+notifications-description": 
"{{doc-apihelp-description|query+notifications}}",
"apihelp-query+notifications-param-prop": 
"{{doc-apihelp-param|query+notifications|prop}}",
"apihelp-query+notifications-param-sections": 
"{{doc-apihelp-param|query+notifications|sections}} Do not translate the quoted 
strings.",
diff --git a/includes/SeenTime.php b/includes/SeenTime.php
index 26e3c56..7e72c4a 100644
--- a/includes/SeenTime.php
+++ b/includes/SeenTime.php
@@ -65,6 +65,12 @@
return $data;
}
 
+   /**
+* Sets the seen time
+*
+* @param string $time Time, in TS_MW format
+* @param string $type Type of seen time to set
+*/
public function setTime( $time, $type = 'all' ) {
if ( $type === 'all' ) {
foreach ( self::$allowedTypes as $allowed ) {
diff --git a/includes/api/ApiEchoMarkSeen.php b/includes/api/ApiEchoMarkSeen.php
index 61ef320..c8f07e3 100644
--- a/includes/api/ApiEchoMarkSeen.php
+++ b/includes/api/ApiEchoMarkSeen.php
@@ -16,9 +16,21 @@
$seenTime = EchoSeenTime::newFromUser( $user );
$seenTime->setTime( $timestamp, $params['type'] );
 
+   if ( $params['timestampFormat'] === 'ISO_8601' ) {
+   $outputTimestamp = wfTimestamp( TS_ISO_8601, $timestamp 
);
+   } else {
+   // MW
+   $this->setWarning( 'The MW timestamp output format is 
deprecated' .
+   ' here. In the future, ISO 8601 will always be 
used for ' .
+   'the output timestamp format.  Adjust your 
client and ' .
+   'set timestampFormat to \'ISO_8601\'.' );
+
+   $outputTimestamp = $timestamp;
+   }
+
$this->getResult()->addValue( 'query', $this->getModuleName(), 
array(
'result' => 'success',
-   'timestamp' => $timestamp,
+   'timestamp' => $outputTimestamp,
) );
}
 
@@ -30,7 +42,12 @@
'type' => array(
ApiBase::PARAM_REQUIRED => true,
ApiBase::PARAM_TYPE => array( 'alert', 
'message', 'all' ),
-   )
+   ),
+   'timestampFormat' => array(
+   // Not using the TS constants, since clients 
can't.
+   ApiBase::PARAM_DFLT => 'MW',
+

[MediaWiki-commits] [Gerrit] Make wikimedia.events an alias for events for mw.track - change (mediawiki...WikimediaEvents)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Make wikimedia.events an alias for events for mw.track
..


Make wikimedia.events an alias for events for mw.track

Since this only happens when the WikimediaEvents extension is
loaded, and unhandled mw.track events are no-ops, this makes
it possible to do Wikimedia-specific logging without breaking
non-Wikimedia sites which use EventLogging with their own schema
repository.

Bug: T138659
Change-Id: Ibf01d9295d90fd9f185571e6b05457ce3d404dac
---
M extension.json
A modules/ext.wikimediaEvents.events.js
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Alex Monk: Looks good to me, but someone else must approve
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 5e1d2ad..6413ca5 100644
--- a/extension.json
+++ b/extension.json
@@ -133,6 +133,7 @@
},
"ext.wikimediaEvents": {
"scripts": [
+   "ext.wikimediaEvents.events.js",
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.searchSatisfaction.js",
diff --git a/modules/ext.wikimediaEvents.events.js 
b/modules/ext.wikimediaEvents.events.js
new file mode 100644
index 000..bd038d3
--- /dev/null
+++ b/modules/ext.wikimediaEvents.events.js
@@ -0,0 +1,11 @@
+/*!
+ * Make mw.track( 'wikimedia.event.foo' ) an alias of mw.track( 'event.foo' ).
+ * This allows logging of events without making the logging code depend on
+ * Wikimedia infrastrucutre: if WikimediaEvents is not installed, the event
+ * will be ignored.
+ */
+( function ( mw ) {
+   mw.trackSubscribe( 'wikimedia.event.', function ( topic, event ) {
+   mw.track( topic.replace( /^wikimedia\./, '' ), event );
+   } );
+}( mediaWiki ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf01d9295d90fd9f185571e6b05457ce3d404dac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix Searcher::$searchContext visibility - change (mediawiki...CirrusSearch)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix Searcher::$searchContext visibility
..


Fix Searcher::$searchContext visibility

Searcher::$searchContext is used by children InterwikiSearcher class.

This fixes the following issue:
Undefined property: CirrusSearch\InterwikiSearcher::$searchContext
in …/extensions/CirrusSearch/includes/InterwikiSearcher.php on line 70

This is a follow-up for 2d3f3780.

Bug: T140950
Change-Id: If978b1309c7938cbd33fb3b8fae18901d3901987
---
M includes/Searcher.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Searcher.php b/includes/Searcher.php
index 0335ed4..8feffd6 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -128,7 +128,7 @@
/**
 * @var SearchContext
 */
-   private $searchContext;
+   protected $searchContext;
 
/**
 * Constructor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If978b1309c7938cbd33fb3b8fae18901d3901987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] icons: Provide a 'tray' icon in alerts pack - change (oojs/ui)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: icons: Provide a 'tray' icon in alerts pack
..


icons: Provide a 'tray' icon in alerts pack

Bug: T140900
Change-Id: Id87f7329b29c5cff5aed8cf9f9b4bc4ae40696cb
---
M demos/pages/icons.js
M src/themes/mediawiki/icons-alerts.json
A src/themes/mediawiki/images/icons/tray.svg
3 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 2ab76d9..0d4aa9a 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -60,7 +60,8 @@
'signature',
'speechBubble',
'speechBubbleAdd',
-   'speechBubbles'
+   'speechBubbles',
+   'tray'
],
interactions: [
'beta',
diff --git a/src/themes/mediawiki/icons-alerts.json 
b/src/themes/mediawiki/icons-alerts.json
index 79f644e..6894d6e 100644
--- a/src/themes/mediawiki/icons-alerts.json
+++ b/src/themes/mediawiki/icons-alerts.json
@@ -35,6 +35,7 @@
"speechBubbles": { "file": {
"ltr": "images/icons/speechBubbles-ltr.svg",
"rtl": "images/icons/speechBubbles-rtl.svg"
-   } }
+   } },
+   "tray": { "file": "images/icons/tray.svg" }
}
 }
diff --git a/src/themes/mediawiki/images/icons/tray.svg 
b/src/themes/mediawiki/images/icons/tray.svg
new file mode 100644
index 000..d7ab69b
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/tray.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87f7329b29c5cff5aed8cf9f9b4bc4ae40696cb
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prerequisites for logstash_checker use - change (operations/puppet)

2016-07-20 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: Prerequisites for logstash_checker use
..

Prerequisites for logstash_checker use

Added the logstash_checker script to the deployment hosts. Open port
9200 from the $DEPLOYMENT_HOSTS to the logstash host so that the checker
script will be able to query logstash.

Change-Id: Ic2b16e7e6717a95a9f236957f0506bb58d3900a8
---
M manifests/role/logstash.pp
M modules/scap/manifests/scripts.pp
2 files changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 3cc2ebf..0b66fc9 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -47,6 +47,12 @@
 srange => '@resolve(krypton.eqiad.wmnet)',
 }
 
+ferm::service { 'logstash_canary_checker':
+proto  => 'tcp',
+port   => '9200',
+srange => '$DEPLOYMENT_HOSTS',
+}
+
 logstash::input::gelf { 'gelf':
 port => 12201,
 }
diff --git a/modules/scap/manifests/scripts.pp 
b/modules/scap/manifests/scripts.pp
index c5d1431..8a22316 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -9,6 +9,13 @@
 class scap::scripts {
 require mediawiki::users
 
+file { '/usr/local/bin/logstash_checker.py':
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/service/logstash_checker.py',
+}
+
 file { '/usr/local/bin/dologmsg':
 owner  => 'root',
 group  => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] Title::getLinkURL(): Allow expanding PROTO_RELATIVE too - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Title::getLinkURL(): Allow expanding PROTO_RELATIVE too
..


Title::getLinkURL(): Allow expanding PROTO_RELATIVE too

Allow callers to get protocol-relative URLs by passing the
PROTO_RELATIVE constant. Since most callers don't pass in $proto, this
shouldn't change very much since the default of non-expanded is
effectively the same, but expanding to a protocol-relative URL when it
is not intended should still be safe.

A few callers that explicitly specified the default in core were also
updated.

Change-Id: I214f17aa6e8e30b647f21f0951fc3a15e87850c7
---
M includes/Title.php
M includes/linker/LinkRenderer.php
M includes/revisiondelete/RevDelArchivedFileItem.php
M includes/revisiondelete/RevDelFileItem.php
4 files changed, 7 insertions(+), 11 deletions(-)

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



diff --git a/includes/Title.php b/includes/Title.php
index 4555f16..bae3a76 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1773,12 +1773,13 @@
 *
 * @param array $query
 * @param bool $query2
-* @param string $proto Protocol to use; setting this will cause a full 
URL to be used
+* @param string|int|bool $proto A PROTO_* constant on how the URL 
should be expanded,
+*   or false (default) for no expansion
 * @see self::getLocalURL for the arguments.
 * @return string The URL
 */
-   public function getLinkURL( $query = '', $query2 = false, $proto = 
PROTO_RELATIVE ) {
-   if ( $this->isExternal() || $proto !== PROTO_RELATIVE ) {
+   public function getLinkURL( $query = '', $query2 = false, $proto = 
false ) {
+   if ( $this->isExternal() || $proto !== false ) {
$ret = $this->getFullURL( $query, $query2, $proto );
} elseif ( $this->getPrefixedText() === '' && 
$this->hasFragment() ) {
$ret = $this->getFragmentForURL();
diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index 432dcb2..c1ed248 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -391,16 +391,13 @@
private function getLinkURL( LinkTarget $target, array $query = [] ) {
// TODO: Use a LinkTargetResolver service instead of Title
$title = Title::newFromLinkTarget( $target );
-   $proto = $this->expandUrls !== false
-   ? $this->expandUrls
-   : PROTO_RELATIVE;
if ( $this->forceArticlePath ) {
$realQuery = $query;
$query = [];
} else {
$realQuery = [];
}
-   $url = $title->getLinkURL( $query, false, $proto );
+   $url = $title->getLinkURL( $query, false, $this->expandUrls );
 
if ( $this->forceArticlePath && $realQuery ) {
$url = wfAppendQuery( $url, $realQuery );
diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php 
b/includes/revisiondelete/RevDelArchivedFileItem.php
index e2bb516..f47a70b 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -107,8 +107,7 @@
'target' => 
$this->list->title->getPrefixedText(),
'file' => $file->getKey(),
'token' => $user->getEditToken( 
$file->getKey() )
-   ],
-   false, PROTO_RELATIVE
+   ]
),
];
}
diff --git a/includes/revisiondelete/RevDelFileItem.php 
b/includes/revisiondelete/RevDelFileItem.php
index 921fe5a..dca4d5a 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -215,8 +215,7 @@
'target' => 
$this->list->title->getPrefixedText(),
'file' => 
$file->getArchiveName(),
'token' => $user->getEditToken( 
$file->getArchiveName() )
-   ],
-   false, PROTO_RELATIVE
+   ]
),
];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] Work around a stupid core upgrade check - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Work around a stupid core upgrade check
..


Work around a stupid core upgrade check

CheckComposerLockUpToDate doesn't know how to compare versions unless
they're exact.

Change-Id: I0eab78208a8b7ea1747165004ef543bd4ebae7ca
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 5fd58f4..58e6694 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"wikimedia/utfnormal": "1.0.3",
"wikimedia/wrappedstring": "2.0.0",
"zordius/lightncandy": "0.23",
-   "monolog/monolog": "~1.18.2"
+   "monolog/monolog": "1.18.2"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eab78208a8b7ea1747165004ef543bd4ebae7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Work around a stupid core upgrade check - change (mediawiki/core)

2016-07-20 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Work around a stupid core upgrade check
..

Work around a stupid core upgrade check

CheckComposerLockUpToDate doesn't know how to compare versions unless
they're exact.

Change-Id: I0eab78208a8b7ea1747165004ef543bd4ebae7ca
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/300174/1

diff --git a/composer.json b/composer.json
index 5fd58f4..58e6694 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"wikimedia/utfnormal": "1.0.3",
"wikimedia/wrappedstring": "2.0.0",
"zordius/lightncandy": "0.23",
-   "monolog/monolog": "~1.18.2"
+   "monolog/monolog": "1.18.2"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eab78208a8b7ea1747165004ef543bd4ebae7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] [WIP] Convert orphan rectifier to use the PendingDatabase - change (mediawiki...DonationInterface)

2016-07-20 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: [WIP] Convert orphan rectifier to use the PendingDatabase
..

[WIP] Convert orphan rectifier to use the PendingDatabase

Depends on SmashPig @I451d145fb5

Bug: T131275
Change-Id: Ic73baedd1d9b446550f712ba8f7571c9a2bd27ab
---
M extension.json
M globalcollect_gateway/GlobalCollectOrphanRectifier.php
A globalcollect_gateway/GlobalCollectOrphanRectifier_stomp.php
M globalcollect_gateway/scripts/orphans.php
A tests/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
5 files changed, 307 insertions(+), 52 deletions(-)


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

diff --git a/extension.json b/extension.json
index 35dcb2c..6afa1cf 100644
--- a/extension.json
+++ b/extension.json
@@ -111,6 +111,7 @@
"GlobalCollectAdapter": 
"globalcollect_gateway/globalcollect.adapter.php",
"GlobalCollectOrphanAdapter": 
"globalcollect_gateway/orphan.adapter.php",
"GlobalCollectOrphanRectifier": 
"globalcollect_gateway/GlobalCollectOrphanRectifier.php",
+   "GlobalCollectOrphanRectifier_stomp": 
"globalcollect_gateway/GlobalCollectOrphanRectifier_stomp.php",
"IngenicoFinancialNumber": 
"globalcollect_gateway/IngenicoFinancialNumber.php",
"IngenicoLanguage": 
"globalcollect_gateway/IngenicoLanguage.php",
"IngenicoMethodCodec": 
"globalcollect_gateway/IngenicoMethodCodec.php",
diff --git a/globalcollect_gateway/GlobalCollectOrphanRectifier.php 
b/globalcollect_gateway/GlobalCollectOrphanRectifier.php
index 7903d69..61c78c0 100644
--- a/globalcollect_gateway/GlobalCollectOrphanRectifier.php
+++ b/globalcollect_gateway/GlobalCollectOrphanRectifier.php
@@ -65,12 +65,6 @@
// 20 minutes: this is exactly equal to something on 
Globalcollect's side.
$time_buffer = 60*20;
 
-   $queue_pool = new CyclicalArray( $this->getOrphanGlobal( 
'gc_cc_limbo_queue_pool' ) );
-   if ( $queue_pool->isEmpty() ) {
-   // FIXME: cheesy inline default
-   $queue_pool = new CyclicalArray( 
GlobalCollectAdapter::GC_CC_LIMBO_QUEUE );
-   }
-
$this->info( "Slaying orphans..." );
$this->start_time = time();
 
@@ -82,53 +76,37 @@
//things we believe we just deleted.
$this->handled_ids = array();
 
-   while ( $this->keepGoing() && !$queue_pool->isEmpty() ) {
-   $current_queue = $queue_pool->current();
-   try {
-   $message = DonationQueue::instance()->peek( 
$current_queue );
+   while ( $this->keepGoing() ) {
+   $message = $this->getNextMessage();
 
-   if ( !$message ) {
-   $this->info( "Emptied queue 
[{$current_queue}], removing from pool." );
-   $queue_pool->dropCurrent();
-   continue;
-   }
-
-   $correlation_id = 'globalcollect-' . 
$message['gateway_txn_id'];
-   if ( array_key_exists( $correlation_id, 
$this->handled_ids ) ) {
-   // We already did this one, keep going. 
 It's fine to draw
-   // again from the same queue.
-   DonationQueue::instance()->delete( 
$correlation_id, $current_queue );
-   continue;
-   }
-
-   // Check the timestamp to see if it's old 
enough, and stop when
-   // we're below the threshold.  Messages are 
guaranteed to pop in
-   // chronological order.
-   $elapsed = $this->start_time - $message['date'];
-   if ( $elapsed < $time_buffer ) {
-   $this->info( "Exhausted new messages in 
[{$current_queue}], removing from pool..." );
-   $queue_pool->dropCurrent();
-
-   continue;
-   }
-
-   // We got ourselves an orphan!
-   if ( $this->rectifyOrphan( $message ) ) {
-   $this->handled_ids[$correlation_id] = 
'rectified';
-   } else {
-   $this->handled_ids[$correlation_id] = 
'error';
-   }
-
-   // Throw out the message either way.

[MediaWiki-commits] [Gerrit] DNS configuration change for creating tcy.wikipedia.org - change (operations/dns)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: DNS configuration change for creating tcy.wikipedia.org
..


DNS configuration change for creating tcy.wikipedia.org

Bug: T140898
Change-Id: Ic4a77fb69951c10631eafd13170faad2f673265c
---
M templates/helpers/langs.tmpl
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/helpers/langs.tmpl b/templates/helpers/langs.tmpl
index 62c9488..40bbde5 100644
--- a/templates/helpers/langs.tmpl
+++ b/templates/helpers/langs.tmpl
@@ -256,6 +256,7 @@
 'sw',
 'szl',
 'ta',
+'tcy',
 'te',
 'tet',
 'tg',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4a77fb69951c10631eafd13170faad2f673265c
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: MarcoAurelio 
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 missing contribution_tracking columns - change (wikimedia...crm)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Add missing contribution_tracking columns
..


Add missing contribution_tracking columns

Change-Id: I600430450c3134fea55f1b09a95b03ea090e8518
---
M sites/all/modules/contribution_tracking/contribution_tracking.install
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git 
a/sites/all/modules/contribution_tracking/contribution_tracking.install 
b/sites/all/modules/contribution_tracking/contribution_tracking.install
index 3210bd7..87d4f63 100644
--- a/sites/all/modules/contribution_tracking/contribution_tracking.install
+++ b/sites/all/modules/contribution_tracking/contribution_tracking.install
@@ -16,6 +16,17 @@
 'unsigned' => true,
 'not null' => false
   ),
+  'form_amount' => array(
+'type' => 'varchar',
+'length' => 20,
+'not null' => false
+  ),
+  'usd_amount' => array(
+'type' => 'numeric',
+'scale' => 2,
+'precision' => 20,
+'not null' => false
+  ),
   'note' => array(
 'type' => 'text',
 'size' => 'normal',
@@ -51,7 +62,7 @@
   'type' => 'varchar',
   'length' => 128,
   'not null' => false,
-),
+  ),
   'optout' => array(
 'type' => 'int',
 'size' => 'tiny',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I600430450c3134fea55f1b09a95b03ea090e8518
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] planet: "RelEng" (jargon)-> "WMF Release Engineering" - change (operations/puppet)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: planet: "RelEng" (jargon)-> "WMF Release Engineering"
..

planet: "RelEng" (jargon)-> "WMF Release Engineering"

Change-Id: I0292137571121afdeac65e7493781e608a82ba2e
---
M modules/planet/templates/feeds/en_config.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index 24e433c..59a8839 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -537,5 +537,5 @@
 name=Monika Sengul-Jones
 
 [https://phabricator.wikimedia.org/phame/blog/feed/1/]
-name=RelEng Blog
+name=WMF Release Engineering
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0292137571121afdeac65e7493781e608a82ba2e
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] More fixes for fundraising roles - change (mediawiki/vagrant)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: More fixes for fundraising roles
..


More fixes for fundraising roles

Fix includes for CRM to get activemq variables
Add settings for ContributionTracking
FIXME no more

Change-Id: I8ebf3b21d500136b55d3f15619c0c4989d9779d2
---
M puppet/modules/crm/manifests/init.pp
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/payments/manifests/init.pp
3 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/crm/manifests/init.pp 
b/puppet/modules/crm/manifests/init.pp
index e5cf331..f73ab19 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -38,6 +38,7 @@
 include ::crm::apache
 include ::crm::civicrm
 include ::crm::tools
+include ::activemq
 
 git::clone { $repo:
 directory => $dir,
diff --git a/puppet/modules/payments/manifests/donation_interface.pp 
b/puppet/modules/payments/manifests/donation_interface.pp
index e7c6880..9a3b367 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -2,8 +2,6 @@
 # Configure the DonationInterface extension
 #
 class payments::donation_interface {
-  # FIXME: Use relative paths to load forms.
-  $DI = "${::payments::dir}/extensions/DonationInterface"
 
   mediawiki::extension { 'payments:DonationInterface':
 settings => {
diff --git a/puppet/modules/payments/manifests/init.pp 
b/puppet/modules/payments/manifests/init.pp
index 01147f6..54805b5 100644
--- a/puppet/modules/payments/manifests/init.pp
+++ b/puppet/modules/payments/manifests/init.pp
@@ -22,6 +22,7 @@
 $dir,
 ) {
   include ::payments::donation_interface
+  include ::crm
 
   git::clone { 'mediawiki-core-fr':
 remote=> 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
@@ -39,6 +40,12 @@
 
   mediawiki::extension { 'payments:ContributionTracking':
 needs_update => true,
+settings => {
+  'wgContributionTrackingDBserver'   => '',
+  'wgContributionTrackingDBname' => $::crm::drupal_db,
+  'wgContributionTrackingDBuser' => $::crm::db_user,
+  'wgContributionTrackingDBpassword' => $::crm::db_pass,
+},
   }
 
   mediawiki::extension { [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ebf3b21d500136b55d3f15619c0c4989d9779d2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Method to override configuration with data - change (wikimedia...SmashPig)

2016-07-20 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Method to override configuration with data
..

Method to override configuration with data

Change-Id: Ieba9ac3337365c31e2c1937c265623e9f9a4d03b
---
M Core/Configuration.php
M Tests/ConfigurationTest.php
2 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/71/300171/1

diff --git a/Core/Configuration.php b/Core/Configuration.php
index 41e4fe9..6b6c18b 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -111,6 +111,18 @@
}
 
/**
+* Override configuration with an array of data
+*
+* This should only be used in tests--note that these overrides take
+* precedence over every configuration file.
+*
+* @param $data array
+*/
+   public function override( $data ) {
+   static::treeMerge( $this->options, $data );
+   }
+
+   /**
 * Loads a configuration file from the cache if it is still valid (ie: 
source files have not
 * changed)
 *
diff --git a/Tests/ConfigurationTest.php b/Tests/ConfigurationTest.php
index 09c65dd..bf0a9c8 100644
--- a/Tests/ConfigurationTest.php
+++ b/Tests/ConfigurationTest.php
@@ -17,5 +17,20 @@
 */
public function testTreeMergeDissimilarTypes() {
$this->setConfig( 'aview', __DIR__ . '/data/dissimilar.yaml' );
+   // expectedException above
+   }
+
+   public function testOverride() {
+   $config = $this->setConfig();
+
+   $this->assertEquals( 'SmashPig', $config->val( 
'logging/root-context' ),
+   'Default config was as expected.' );
+   $config->override( array(
+   'logging' => array(
+   'root-context' => 'FOO',
+   ),
+   ) );
+   $this->assertEquals( 'FOO', $config->val( 
'logging/root-context' ),
+   'Config was overridden.' );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieba9ac3337365c31e2c1937c265623e9f9a4d03b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Bump src to ed2f8228 for deploy - change (mediawiki...deploy)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Bump src to ed2f8228 for deploy
..


Bump src to ed2f8228 for deploy

Change-Id: I6693350f6b11c6c9e4ae5613d305c6cfe464c694
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index 45beb6c..ed2f822 16
--- a/src
+++ b/src
-Subproject commit 45beb6c0abc5a313ad75259053d74466a51f91cd
+Subproject commit ed2f82289e95690eb1d580994df6d6e2841a

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

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

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

[MediaWiki-commits] [Gerrit] Allow 'data-*' attributes in personal tools links - change (mediawiki/core)

2016-07-20 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Allow 'data-*' attributes in personal tools links
..

Allow 'data-*' attributes in personal tools links

We are limiting the attributes that are read and rendered for the
personal toolbar, but there are cases -- especially as tools get
more and more complex -- for needing to supply and read more information.

The use case that led to this change is the need to style Notification
badges with values in ::before and ::after pseudo-elements; these
elements need to display some prefixed content, and the best (only)
way to do that in no-js mode, is to set it up in CSS to be read
out of an attribute (using attr( xxx ); ).

This means that we need to read a specific attribute from the element,
but the only attributes allowed were insufficient. Allowing for data-*
attributes seemed not only a good solution for this specific case,
but a good idea in general for future tools that are added and
manipulate the personal toolbar links - allowing for storing information
without polluting the DOM.

Bug: T115845
Change-Id: Ic666540d70de52f337f839da0518cb83a990f5fd
---
M includes/skins/BaseTemplate.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/300170/1

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 13db176..84d4e30 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -140,7 +140,7 @@
if ( isset( $plink['active'] ) ) {
$ptool['active'] = $plink['active'];
}
-   foreach ( [ 'href', 'class', 'text', 'dir' ] as $k ) {
+   foreach ( [ 'href', 'class', 'text', 'dir', 'data' ] as 
$k ) {
if ( isset( $plink[$k] ) ) {
$ptool['links'][0][$k] = $plink[$k];
}
@@ -363,6 +363,13 @@
unset( $attrs[$k] );
}
 
+   if ( isset( $attrs['data'] ) ) {
+   foreach ( $attrs['data'] as $key => $value ) {
+   $attrs[ 'data-' . $key ] = $value;
+   unset( $attrs[ 'data' ] );
+   }
+   }
+
if ( isset( $item['id'] ) && !isset( $item['single-id'] 
) ) {
$item['single-id'] = $item['id'];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic666540d70de52f337f839da0518cb83a990f5fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] admin: add mpany to analytics-privatedata-users, researchers - change (operations/puppet)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: admin: add mpany to analytics-privatedata-users,researchers
..


admin: add mpany to analytics-privatedata-users,researchers

Gives access to new shell user Maximilian Pany which is part
of the request described on T139764.

Fundraising has hired consultants to help with fundraising analytics.

'bastiononly' group for access to bastion hosts.

analytics-privatedata-users and researchers as requested and suggested
by ottomata

access is granted to work with fundraising's banner history data.

approved by MeganHernandez on ticket

Bug:T140399
Change-Id: I7d19fb320db21be6d10d8d4a347654ca7787c269
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jgreen: Looks good to me, but someone else must approve
  Dzahn: Verified; Looks good to me, approved



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cf601ef..ac72641 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -82,7 +82,7 @@
   gpaumier, moushira, aklapper, qchris, tjones, srijan, addshore,
   jminor, pt1979, asherman, etonkovidova, sbisson, zhousquared,
   atgomez, jgirault, jdrewniak, matmarex, elukey, jdcc, ppchelko,
-  nschaaf, dstrine, ladsgroup, joewalsh]
+  nschaaf, dstrine, ladsgroup, joewalsh, mpany]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -123,7 +123,7 @@
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
   neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair,
   jminor, asherman, etonkovidova, sbisson, addshore, matmarex, 
elukey,
-  nikerabbit, nschaaf, dstrine, joewalsh]
+  nikerabbit, nschaaf, dstrine, joewalsh, mpany]
   ldap-admins:
 gid: 715
 description: ldap admins
@@ -242,7 +242,7 @@
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
   csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf,
   dcausse, bd808, tjones, mobrovac, jgirault, jdrewniak, ejegg, 
jdcc, ori,
-  bmansurov, atgomez, amire80, kartik, pcoombe, foks]
+  bmansurov, atgomez, amire80, kartik, pcoombe, foks, mpany]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d19fb320db21be6d10d8d4a347654ca7787c269
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: Ottomata 
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 "Disable user creation of new VMs until we increase c... - change (operations/puppet)

2016-07-20 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Disable user creation of new VMs until we increase 
capacity."
..


Revert "Disable user creation of new VMs until we increase capacity."

We have labvirt1012 and 1013 in the pool now.

This reverts commit 83bda78700a5532f40c7e36220275211c466a5b0.

Change-Id: I7c3da563bd4647f2277575ecfcdc618c6f1a9e4e
---
M modules/openstack/files/liberty/horizon/nova_policy.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/files/liberty/horizon/nova_policy.json 
b/modules/openstack/files/liberty/horizon/nova_policy.json
index 30d5f8d..55ff385 100644
--- a/modules/openstack/files/liberty/horizon/nova_policy.json
+++ b/modules/openstack/files/liberty/horizon/nova_policy.json
@@ -4,7 +4,7 @@
 "admin_or_projectadmin":  [["is_admin:True"], ["role:projectadmin"]],
 "default": [["rule:admin_or_projectadmin"]],
 
-"compute:create": "!",
+"compute:create": "rule:admin_or_projectadmin",
 "compute:delete": "rule:admin_or_projectadmin",
 "compute:create:attach_network": "role:admin",
 "compute:create:attach_volume": "role:admin",

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

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

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

[MediaWiki-commits] [Gerrit] Add missing contribution_tracking columns - change (wikimedia...crm)

2016-07-20 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Add missing contribution_tracking columns
..

Add missing contribution_tracking columns

Change-Id: I600430450c3134fea55f1b09a95b03ea090e8518
---
M sites/all/modules/contribution_tracking/contribution_tracking.install
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/69/300169/1

diff --git 
a/sites/all/modules/contribution_tracking/contribution_tracking.install 
b/sites/all/modules/contribution_tracking/contribution_tracking.install
index 3210bd7..b43a50b 100644
--- a/sites/all/modules/contribution_tracking/contribution_tracking.install
+++ b/sites/all/modules/contribution_tracking/contribution_tracking.install
@@ -16,6 +16,17 @@
 'unsigned' => true,
 'not null' => false
   ),
+  'form_amount' => array(
+'type' => 'varchar',
+'length' => 20,
+'not null' => false
+  ),
+  'usd_amount' => array(
+'type' => 'numeric',
+'scale' => 20,
+'precision' => 2,
+'not null' => false
+  ),
   'note' => array(
 'type' => 'text',
 'size' => 'normal',
@@ -51,7 +62,7 @@
   'type' => 'varchar',
   'length' => 128,
   'not null' => false,
-),
+  ),
   'optout' => array(
 'type' => 'int',
 'size' => 'tiny',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I600430450c3134fea55f1b09a95b03ea090e8518
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Fix Searcher::$searchContext visibility - change (mediawiki...CirrusSearch)

2016-07-20 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Fix Searcher::$searchContext visibility
..

Fix Searcher::$searchContext visibility

Searcher::$searchContext is used by children InterwikiSearcher class.

This fixes the following issue:
Undefined property: CirrusSearch\InterwikiSearcher::$searchContext
in …/extensions/CirrusSearch/includes/InterwikiSearcher.php on line 70

This is a follow-up for 2d3f3780.

Bug: T140950
Change-Id: If978b1309c7938cbd33fb3b8fae18901d3901987
---
M includes/Searcher.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/68/300168/1

diff --git a/includes/Searcher.php b/includes/Searcher.php
index 0335ed4..8feffd6 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -128,7 +128,7 @@
/**
 * @var SearchContext
 */
-   private $searchContext;
+   protected $searchContext;
 
/**
 * Constructor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If978b1309c7938cbd33fb3b8fae18901d3901987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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

[MediaWiki-commits] [Gerrit] ProfileStub: Remove getCurrentSection(), unused - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: ProfileStub: Remove getCurrentSection(), unused
..


ProfileStub: Remove getCurrentSection(), unused

No callers, no implementations in other Profiler classes

Change-Id: I5b5364d5b40964944e1595056b4c292610fcdf36
---
M includes/profiler/ProfilerStub.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/includes/profiler/ProfilerStub.php 
b/includes/profiler/ProfilerStub.php
index 3fe9cdd..1017e44 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -40,10 +40,6 @@
public function close() {
}
 
-   public function getCurrentSection() {
-   return '';
-   }
-
public function logData() {
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b5364d5b40964944e1595056b4c292610fcdf36
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Reedy 
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 "contint: tidy Nodepool slaves config history" - change (operations/puppet)

2016-07-20 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Revert "contint: tidy Nodepool slaves config history"
..


Revert "contint: tidy Nodepool slaves config history"

Puppet tidy lacks a bunch of features such as being able
to do a match against the whole patch.  It does it solely
against the file basename which is not what I wanted to do.

This reverts commit 4bbfd3b9ec21e044a15d0c4e78736cac2332af2c.

Bug: T126552
Change-Id: Ibf289e4f6cd77a3367f7b5ebe4a9283749b9338c
---
M modules/role/manifests/ci/master.pp
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/modules/role/manifests/ci/master.pp 
b/modules/role/manifests/ci/master.pp
index 921b074..18979ab 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -21,15 +21,6 @@
 
 backup::set { 'contint' : }
 
-# Nodepool spawn non ephemeral slaves which causes config-history plugin to
-# fill up entries until it reaches the limit of 32k inodes. T126552
-tidy { 'history of nodepool slaves config':
-path=> '/var/lib/jenkins/config-history/nodes',
-age => '1d',
-recurse => true,
-matches => 'ci-*_deleted_*',
-}
-
 nrpe::monitor_service { 'jenkins_zmq_publisher':
 description   => 'jenkins_zmq_publisher',
 contact_group => 'contint',

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b496f7d..abce501 - change (mediawiki/extensions)

2016-07-20 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: b496f7d..abce501
..


Syncronize VisualEditor: b496f7d..abce501

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

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



diff --git a/VisualEditor b/VisualEditor
index b496f7d..abce501 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b496f7d3f11bb240a9d62747a1c5e3807c1472d3
+Subproject commit abce5019b10057180d9beb13ecb17ddcd6199c08

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b496f7d..abce501 - change (mediawiki/extensions)

2016-07-20 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: b496f7d..abce501
..

Syncronize VisualEditor: b496f7d..abce501

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/67/300167/1

diff --git a/VisualEditor b/VisualEditor
index b496f7d..abce501 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b496f7d3f11bb240a9d62747a1c5e3807c1472d3
+Subproject commit abce5019b10057180d9beb13ecb17ddcd6199c08

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

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

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

[MediaWiki-commits] [Gerrit] Change-Prop: Fix error ignoring config bug - change (operations/puppet)

2016-07-20 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review.

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

Change subject: Change-Prop: Fix error ignoring config bug
..

Change-Prop: Fix error ignoring config bug

An obvious bug in the error ignoring configuration.

Change-Id: Ibf8a7605b10f155b0e91c4a0584f6f7bb8ad9182
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/300166/1

diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index eedf47f..cb3cec3 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -123,9 +123,9 @@
   null_edit:
 topic: resource_change
 ignore:
-  # Ignoring 403 since some of the pages with high number of 
null_edit events are blacklisted
-  - 403
-  - 412
+  status:
+- 403 # Ignoring 403 since some of the pages with high 
number of null_edit events are blacklisted
+- 412
 match:
   meta:
 uri: '/^https?:\/\/[^\/]+\/wiki\/(?.+)$/'
@@ -165,8 +165,9 @@
   page_delete:
 topic: mediawiki.page_delete
 ignore:
-  - 404 # 404 is a normal response for page deletion
-  - 412
+  status:
+- 404 # 404 is a normal response for page deletion
+- 412
 exec:
   method: get
   uri: '<%= @restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.title}'

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

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

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

[MediaWiki-commits] [Gerrit] Setup CirrusSearch continuous saneitization process to run v... - change (operations/puppet)

2016-07-20 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged.

Change subject: Setup CirrusSearch continuous saneitization process to run via 
cron
..


Setup CirrusSearch continuous saneitization process to run via cron

Bug: T139200
Change-Id: I3b934b52b7b67726ba58c3d6c37c605b869202c2
---
A modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
2 files changed, 44 insertions(+), 8 deletions(-)

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



diff --git a/modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize 
b/modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
new file mode 100644
index 000..1d4972b
--- /dev/null
+++ b/modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
@@ -0,0 +1,14 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+#
+
+/var/log/mediawiki/cirrus-sanitize/*.log {
+   daily
+   notifempty
+   maxage 30
+   rotate 5
+   dateext
+   compress
+   missingok
+   nocreate
+}
diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp 
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index cb898d8..abfdf22 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -1,23 +1,33 @@
 class mediawiki::maintenance::cirrussearch( $ensure = present ) {
 require mediawiki::users
 
+Cron {
+ensure  => $ensure,
+user=> $::mediawiki::users::web,
+}
+
 # Rebuilds the completion suggester indices daily. This is scheduled
 # to run during the low period of cirrus usage, which is generally 3am
 # to 7am UTC. The `|| true` statement ensures one failing wiki doesn't
 # fail the entire job. This job, as of mar 2015, takes around 5 hours
 # to run.
-Cron {
-ensure  => $ensure,
-user=> $::mediawiki::users::web,
+cron { 'cirrus_build_completion_indices_eqiad':
+command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --replicationTimeout=5400 --cluster=eqiad --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log 2>&1 || true\'',
 minute  => 30,
 hour=> 2,
 }
 
-cron {
-'cirrus_build_completion_indices_eqiad':
-command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh 
-c \'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --replicationTimeout=5400 --cluster=eqiad --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log 2>&1 || true\'';
-'cirrus_build_completion_indices_codfw':
-command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh 
-c \'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --replicationTimeout=5400 --cluster=codfw --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.codfw.log 2>&1 || true\''
+cron { 'cirrus_build_completion_indices_codfw':
+command => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --replicationTimeout=5400 --cluster=codfw --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.codfw.log 2>&1 || true\'',
+minute  => 30,
+hour=> 2,
+}
+
+# Push sanitze jobs to the jobqueue every 2 hours
+cron { 'cirrus_sanitize_jobs':
+command => '/usr/local/bin/foreachwiki 
extensions/CirrusSearch/maintenance/saneitizeJobs.php --push 
--refresh-freq=7200 >> /var/log/mediawiki/cirrus-sanitize/push-jobs.log 2>&1',
+minute  => 10,
+hour=> '*/2',
 }
 
 file { '/var/log/mediawiki/cirrus-suggest':
@@ -31,4 +41,16 @@
 ensure => $ensure,
 source => 
'puppet:///modules/mediawiki/maintenance/logrotate.d_cirrus-suggest',
 }
+
+file { '/var/log/mediawiki/cirrus-sanitize':
+ensure => ensure_directory($ensure),
+owner  => $::mediawiki::users::web,
+group  => $::mediawiki::users::web,
+mode   => '0775'
+}
+
+logrotate::conf { 'cirrus-sanitize':
+ensure => $ensure,
+source => 
'puppet:///modules/mediawiki/maintenance/logrotate.d_cirrus-sanitize',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b934b52b7b67726ba58c3d6c37c605b869202c2
Gerrit-PatchSet: 5
Gerrit-Project:

[MediaWiki-commits] [Gerrit] graph data update - change (wikimedia/TransparencyReport-private)

2016-07-20 Thread Siddparmar (Code Review)

Siddparmar has submitted this change and it was merged.

Change subject: graph data update
..


graph data update

Change-Id: I294df7c9fbfd3b334152eb1ad69bac3e98f1be07
---
M build/content.html
M build/data/dmca_requests.csv
M build/data/other_companies.csv
M build/data/targeted_dmca.csv
M build/data/targeted_takedown.csv
M build/fr/content.html
M build/fr/privacy.html
M build/javascripts/content.js
M build/javascripts/rag.js
M build/privacy.html
M locales/en.yml
M source/data/dmca_requests.csv
M source/data/other_companies.csv
M source/data/targeted_dmca.csv
M source/data/targeted_takedown.csv
M source/javascripts/content.js
M source/javascripts/rag.js
M source/localizable/content.html.erb
M source/localizable/privacy.html.erb
19 files changed, 540 insertions(+), 381 deletions(-)

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



diff --git a/build/content.html b/build/content.html
index 244b025..b158a2e 100644
--- a/build/content.html
+++ b/build/content.html
@@ -221,7 +221,8 @@
Jan - Jun 
2014
Jul - Dec 
2014
Jan - Jun 
2015
-   Jul - Dec 
2015
+   Jul - Dec 
2015
+   Jan - Jun 
2016

 

@@ -243,14 +244,14 @@
 
 
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Total Number of RTBF Requests
-  4
+  5
 
   
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Number of Requests Granted
   0
@@ -268,18 +269,18 @@
 
 
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Total Number of DMCA Takedown Requests
-  20
+  22
 
   
 
   
-Jul – Dec 2015
+Jan – Jun 2016
 
   Percentage of Requests Granted
-  45%
+  27%
 
   
 
@@ -333,7 +334,8 @@
Jan - Jun 2014
Jul - Dec 2014
Jan - Jun 2015
-   Jul - Dec 2015
+   Jul - Dec 2015
+   Jan - Jun 2016

 

@@ -359,7 +361,8 @@
Jan - Jun 2014
Jul - Dec 2014
Jan - Jun 2015
-   Jul - Dec 2015
+   Jul - Dec 2015
+   Jan - Jun 2016

 

@@ -506,6 +509,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/build/data/dmca_requests.csv b/build/data/dmca_requests.csv
index c1431f2..a59e466 100644
--- a/build/data/dmca_requests.csv
+++ b/build/data/dmca_requests.csv
@@ -1,35 +1,41 @@
-key,requests,complied,duration
-USA,13,9,jul12jun13
-United Kingdom,3,0,jul12jun13
-France,2,0,jul12jun13
-Spain,4,1,jul12jun13
-Canada,1,0,jul12jun13
-Australia,2,1,jul12jun13
-India,2,1,jul12jun13
-Netherlands,1,0,jul12jun13
-New Zealand,1,0,jul12jun13
-Pakistan,2,2,jul12jun13
-Unknown,1,0,jul12jun13
-Australia,1,1,juldec13
-Bangladesh,1,0,juldec13
-Germany,2,1,juldec13
-South Korea,1,0,juldec13
-United Kingdom,1,0,juldec13
-USA,10,4,juldec13
-Brazil,1,0,janjun14
-USA,8,4,janjun14
-Unknown,1,0,janjun14
-USA,10,1,juldec14
-Netherlands,1,0,juldec14
-USA,15,3,janjun15
-Australia,1,0,janjun15
-Canada,1,0,janjun15
-Italy,1,0,janjun15
-Russia,1,0,janjun15
-Spain,1,0,janjun15
-United Kingdom,1,0,janjun15
-USA,14,8,juldec15
-Spain,2,0,juldec15
-United Kingdom,2,1,juldec15
-Germany,1,0,juldec15
-Italy,1,0,juldec15
\ No newline at end of file
+key,requests,complied,duration
+USA,13,9,jul12jun13
+United Kingdom,3,0,jul12jun13
+France,2,0,jul12jun13
+Spain,4,1,jul12jun13
+Canada,1,0,jul12jun13
+Australia,2,1,jul12jun13
+India,2,1,jul12jun13
+Netherlands,1,0,jul12jun13
+New Zealand,1,0,jul12jun13
+Pakistan,2,2,jul12jun13
+Unknown,1,0,jul12jun13
+Australia,1,1,juldec13
+Bangladesh,1,0,juldec13
+Germany,2,1,juldec13
+South Korea,1,0,juldec13
+United Kingdom,1,0,juldec13
+USA,10,4,juldec13
+Brazil,1,0,janjun14
+USA,8,4,janjun14
+Unknown,1,0,janjun14
+USA,10,1,juldec14
+Netherlands,1,0,juldec14
+USA,15,3,janjun15
+Australia,1,0,janjun15
+Canada,1,0,janjun15
+Italy,1,0,janjun15
+Russia,1,0,janjun15
+Spain,1,0,janjun15
+United Kingdom,1,0,janjun15
+USA,14,8,juldec15
+Spain,2,0,juldec15
+United Kingdom,2,1,juldec15
+Germany,1,0,juldec15
+Italy,1,0,juldec15
+USA,16,6,janjun16
+India,2,0,janjun16
+Australia,1,0,janjun16
+Mexico,1,0,janjun16
+Netherlands,1,0,janjun16
+Sweden,1,0,janjun16
\ No newline at end of file
diff --git a/build/data/other_companies.csv b/build/data/other_companies.csv
index 1ea8fb9..0a37879 100644
--- a/build/data/other_companies.csv
+++ b/build/data/other_companies.csv
@@ -2,5 +2,5 @@
 Wikimedia,25,1
 LinkedIn,139,91
 Twitter,5560,3558
-Google,35365,22279
+Google,40677,26033
 Facebook,46710,31691
diff --git a/build/data/targeted_dmca.csv b/build/data/targeted_dmca.csv
index f0ce4a2..af77a4d 100644
---

[MediaWiki-commits] [Gerrit] graph data update - change (wikimedia/TransparencyReport-private)

2016-07-20 Thread Siddparmar (Code Review)

Siddparmar has uploaded a new change for review.

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

Change subject: graph data update
..

graph data update

Change-Id: I294df7c9fbfd3b334152eb1ad69bac3e98f1be07
---
M build/content.html
M build/data/dmca_requests.csv
M build/data/other_companies.csv
M build/data/targeted_dmca.csv
M build/data/targeted_takedown.csv
M build/fr/content.html
M build/fr/privacy.html
M build/javascripts/content.js
M build/javascripts/rag.js
M build/privacy.html
M locales/en.yml
M source/data/dmca_requests.csv
M source/data/other_companies.csv
M source/data/targeted_dmca.csv
M source/data/targeted_takedown.csv
M source/javascripts/content.js
M source/javascripts/rag.js
M source/localizable/content.html.erb
M source/localizable/privacy.html.erb
19 files changed, 540 insertions(+), 381 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private 
refs/changes/65/300165/1

diff --git a/build/content.html b/build/content.html
index 244b025..b158a2e 100644
--- a/build/content.html
+++ b/build/content.html
@@ -221,7 +221,8 @@
Jan - Jun 
2014
Jul - Dec 
2014
Jan - Jun 
2015
-   Jul - Dec 
2015
+   Jul - Dec 
2015
+   Jan - Jun 
2016

 

@@ -243,14 +244,14 @@
 
 
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Total Number of RTBF Requests
-  4
+  5
 
   
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Number of Requests Granted
   0
@@ -268,18 +269,18 @@
 
 
   
-Jul 2015 – Dec 2015
+Jan 2016 – Jun 2016
 
   Total Number of DMCA Takedown Requests
-  20
+  22
 
   
 
   
-Jul – Dec 2015
+Jan – Jun 2016
 
   Percentage of Requests Granted
-  45%
+  27%
 
   
 
@@ -333,7 +334,8 @@
Jan - Jun 2014
Jul - Dec 2014
Jan - Jun 2015
-   Jul - Dec 2015
+   Jul - Dec 2015
+   Jan - Jun 2016

 

@@ -359,7 +361,8 @@
Jan - Jun 2014
Jul - Dec 2014
Jan - Jun 2015
-   Jul - Dec 2015
+   Jul - Dec 2015
+   Jan - Jun 2016

 

@@ -506,6 +509,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/build/data/dmca_requests.csv b/build/data/dmca_requests.csv
index c1431f2..a59e466 100644
--- a/build/data/dmca_requests.csv
+++ b/build/data/dmca_requests.csv
@@ -1,35 +1,41 @@
-key,requests,complied,duration
-USA,13,9,jul12jun13
-United Kingdom,3,0,jul12jun13
-France,2,0,jul12jun13
-Spain,4,1,jul12jun13
-Canada,1,0,jul12jun13
-Australia,2,1,jul12jun13
-India,2,1,jul12jun13
-Netherlands,1,0,jul12jun13
-New Zealand,1,0,jul12jun13
-Pakistan,2,2,jul12jun13
-Unknown,1,0,jul12jun13
-Australia,1,1,juldec13
-Bangladesh,1,0,juldec13
-Germany,2,1,juldec13
-South Korea,1,0,juldec13
-United Kingdom,1,0,juldec13
-USA,10,4,juldec13
-Brazil,1,0,janjun14
-USA,8,4,janjun14
-Unknown,1,0,janjun14
-USA,10,1,juldec14
-Netherlands,1,0,juldec14
-USA,15,3,janjun15
-Australia,1,0,janjun15
-Canada,1,0,janjun15
-Italy,1,0,janjun15
-Russia,1,0,janjun15
-Spain,1,0,janjun15
-United Kingdom,1,0,janjun15
-USA,14,8,juldec15
-Spain,2,0,juldec15
-United Kingdom,2,1,juldec15
-Germany,1,0,juldec15
-Italy,1,0,juldec15
\ No newline at end of file
+key,requests,complied,duration
+USA,13,9,jul12jun13
+United Kingdom,3,0,jul12jun13
+France,2,0,jul12jun13
+Spain,4,1,jul12jun13
+Canada,1,0,jul12jun13
+Australia,2,1,jul12jun13
+India,2,1,jul12jun13
+Netherlands,1,0,jul12jun13
+New Zealand,1,0,jul12jun13
+Pakistan,2,2,jul12jun13
+Unknown,1,0,jul12jun13
+Australia,1,1,juldec13
+Bangladesh,1,0,juldec13
+Germany,2,1,juldec13
+South Korea,1,0,juldec13
+United Kingdom,1,0,juldec13
+USA,10,4,juldec13
+Brazil,1,0,janjun14
+USA,8,4,janjun14
+Unknown,1,0,janjun14
+USA,10,1,juldec14
+Netherlands,1,0,juldec14
+USA,15,3,janjun15
+Australia,1,0,janjun15
+Canada,1,0,janjun15
+Italy,1,0,janjun15
+Russia,1,0,janjun15
+Spain,1,0,janjun15
+United Kingdom,1,0,janjun15
+USA,14,8,juldec15
+Spain,2,0,juldec15
+United Kingdom,2,1,juldec15
+Germany,1,0,juldec15
+Italy,1,0,juldec15
+USA,16,6,janjun16
+India,2,0,janjun16
+Australia,1,0,janjun16
+Mexico,1,0,janjun16
+Netherlands,1,0,janjun16
+Sweden,1,0,janjun16
\ No newline at end of file
diff --git a/build/data/other_companies.csv b/build/data/other_companies.csv
index 1ea8fb9..0a37879 100644
--- a/build/data/other_companies.csv
+++ b/build/data/other_companies.csv
@@ -2,5 +2,5 @@
 Wikimedia,25,1
 LinkedIn,139,91
 Twitter,5560,3558
-Google,35365,22279
+Google,40677,26033
 Facebook,46710,31691
diff --git a/build/data/targeted_dmca.csv

[MediaWiki-commits] [Gerrit] More fixes for fundraising roles - change (mediawiki/vagrant)

2016-07-20 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: More fixes for fundraising roles
..

More fixes for fundraising roles

Fix includes for CRM to get activemq variables
Add settings for ContributionTracking
FIXME no more

Change-Id: I8ebf3b21d500136b55d3f15619c0c4989d9779d2
---
M puppet/modules/crm/manifests/init.pp
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/payments/manifests/init.pp
3 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/64/300164/1

diff --git a/puppet/modules/crm/manifests/init.pp 
b/puppet/modules/crm/manifests/init.pp
index e5cf331..f73ab19 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -38,6 +38,7 @@
 include ::crm::apache
 include ::crm::civicrm
 include ::crm::tools
+include ::activemq
 
 git::clone { $repo:
 directory => $dir,
diff --git a/puppet/modules/payments/manifests/donation_interface.pp 
b/puppet/modules/payments/manifests/donation_interface.pp
index e7c6880..9a3b367 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -2,8 +2,6 @@
 # Configure the DonationInterface extension
 #
 class payments::donation_interface {
-  # FIXME: Use relative paths to load forms.
-  $DI = "${::payments::dir}/extensions/DonationInterface"
 
   mediawiki::extension { 'payments:DonationInterface':
 settings => {
diff --git a/puppet/modules/payments/manifests/init.pp 
b/puppet/modules/payments/manifests/init.pp
index 01147f6..41a9d41 100644
--- a/puppet/modules/payments/manifests/init.pp
+++ b/puppet/modules/payments/manifests/init.pp
@@ -22,6 +22,7 @@
 $dir,
 ) {
   include ::payments::donation_interface
+  include ::crm
 
   git::clone { 'mediawiki-core-fr':
 remote=> 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
@@ -39,6 +40,12 @@
 
   mediawiki::extension { 'payments:ContributionTracking':
 needs_update => true,
+settings => {
+  'wgContributionTrackingDBserver'   => 'localhost',
+  'wgContributionTrackingDBname' => "${::crm::drupal_db}",
+  'wgContributionTrackingDBuser' => "${::crm::db_user}",
+  'wgContributionTrackingDBpassword' => "${::crm::db_pass}",
+},
   }
 
   mediawiki::extension { [

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

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

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

[MediaWiki-commits] [Gerrit] 'pending-new' instead of 'pending-atomic' - change (wikimedia...SmashPig)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: 'pending-new' instead of 'pending-atomic'
..


'pending-new' instead of 'pending-atomic'

For consistency with DonationInterface

Change-Id: I2afb88f5164debe6ac6c59ae1ae9e8f44c713e86
---
M Maintenance/ConsumePendingQueue.php
M SmashPig.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/Maintenance/ConsumePendingQueue.php 
b/Maintenance/ConsumePendingQueue.php
index bc08fdf..6440eea 100644
--- a/Maintenance/ConsumePendingQueue.php
+++ b/Maintenance/ConsumePendingQueue.php
@@ -23,7 +23,7 @@
 
public function __construct() {
parent::__construct();
-   $this->addOption( 'queue', 'queue name to consume from', 
'pending-atomic' );
+   $this->addOption( 'queue', 'queue name to consume from', 
'pending-new' );
$this->addOption( 'time-limit', 'Try to keep execution under 
 seconds', 60, 't' );
$this->addOption( 'max-messages', 'At most consume  
messages', 0, 'm' );
}
diff --git a/SmashPig.yaml b/SmashPig.yaml
index 9d7a617..5434502 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -22,7 +22,7 @@
 inst-args:
 - pending
 
-pending-atomic:
+pending-new:
 class: PHPQueue\Backend\Predis
 inst-args:
 -

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2afb88f5164debe6ac6c59ae1ae9e8f44c713e86
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ProfileStub: Remove getCurrentSection(), unused - change (mediawiki/core)

2016-07-20 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: ProfileStub: Remove getCurrentSection(), unused
..

ProfileStub: Remove getCurrentSection(), unused

No callers, no implementations in other Profiler classes

Change-Id: I5b5364d5b40964944e1595056b4c292610fcdf36
---
M includes/profiler/ProfilerStub.php
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/300135/1

diff --git a/includes/profiler/ProfilerStub.php 
b/includes/profiler/ProfilerStub.php
index 3fe9cdd..1017e44 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -40,10 +40,6 @@
public function close() {
}
 
-   public function getCurrentSection() {
-   return '';
-   }
-
public function logData() {
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Use UserLoginComplete parameter instead of request method fo... - change (mediawiki...CentralAuth)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Use UserLoginComplete parameter instead of request method for 
central login
..


Use UserLoginComplete parameter instead of request method for central login

Bug: T140853
Change-Id: I7b65319ce52adb71755fc2dbfc8c9912633ba43f
Depends-On: If8582ff61aee62b1d424e473b230ca883ddb6d05
---
M includes/CentralAuthHooks.php
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index a771366..aa7412f 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -377,9 +377,10 @@
/**
 * @param $user User
 * @param $inject_html string
+* @param $direct bool Was this directly after a login? (see T140853)
 * @return bool
 */
-   static function onUserLoginComplete( &$user, &$inject_html ) {
+   static function onUserLoginComplete( &$user, &$inject_html, $direct = 
null ) {
global $wgCentralAuthCookies;
 
if ( !$wgCentralAuthCookies ) {
@@ -387,9 +388,13 @@
return true;
}
 
+   if ( $direct === null ) { // B/C
+   $direct = 
RequestContext::getMain()->getRequest()->wasPosted();
+   }
+
// Redirect to the central wiki and back to complete login, if 
necessary
$centralUser = CentralAuthUser::getInstance( $user );
-   self::doCentralLoginRedirect( $user, $centralUser, $inject_html 
);
+   self::doCentralLoginRedirect( $user, $centralUser, 
$inject_html, $direct );
 
return true;
}
@@ -468,9 +473,12 @@
 * @param User $user
 * @param CentralAuthUser $centralUser
 * @param string $inject_html
+* @param $direct bool Was this directly after a login? (see T140853)
 * @return bool
 */
-   protected static function doCentralLoginRedirect( User $user, 
CentralAuthUser $centralUser, &$inject_html ) {
+   protected static function doCentralLoginRedirect(
+   User $user, CentralAuthUser $centralUser, &$inject_html, $direct
+   ) {
global $wgCentralAuthLoginWiki, $wgSecureLogin, 
$wgDisableAuthManager;
 
$context = RequestContext::getMain();
@@ -484,9 +492,7 @@
 
// Check that this is actually for a special login page view
$title = $context->getTitle();
-   if ( $request->wasPosted() &&
-   ( $title->isSpecial( 'Userlogin' ) || 
$title->isSpecial( 'CreateAccount' ) )
-   ) {
+   if ( $direct && ( $title->isSpecial( 'Userlogin' ) || 
$title->isSpecial( 'CreateAccount' ) ) ) {
// User will be redirected to 
Special:CentralLogin/start (central wiki),
// then redirected back to 
Special:CentralLogin/complete (this wiki).
// Sanity check that "returnto" is not one of the 
central login pages. If it

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b65319ce52adb71755fc2dbfc8c9912633ba43f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Gergő Tisza 
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 $direct parameter to UserLoginComplete hook - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Add $direct parameter to UserLoginComplete hook
..


Add $direct parameter to UserLoginComplete hook

This will help to differentiate between actual login and visiting
the login page while already logged in.

Bug: T140853
Change-Id: If8582ff61aee62b1d424e473b230ca883ddb6d05
---
M RELEASE-NOTES-1.28
M docs/hooks.txt
M includes/api/ApiLogin.php
M includes/specials/SpecialCreateAccount.php
M includes/specials/SpecialUserLogin.php
M includes/specials/pre-authmanager/SpecialUserlogin.php
6 files changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 8b00d2e..adf596f 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -68,6 +68,8 @@
 * Deprecated APIEditBeforeSave hook in favor of EditFilterMergedContent.
 * The 'UploadVerification' hook is deprecated. Use 'UploadVerifyFile' instead.
 * SiteConfiguration::isLocalVHost() was removed (deprecated since 1.25).
+* The 'UserLoginComplete' hook has a new parameter to differentiate between 
actual
+  login and visiting the login page while already logged in.
 
 == Compatibility ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2b3116d..e1b3974 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3467,6 +3467,9 @@
 For functionality that needs to run after any login (API or web) use 
UserLoggedIn.
 &$user: the user object that was created on login
 &$inject_html: Any HTML to inject after the "logged in" message.
+$direct: (bool) The hook is called directly after a successful login. This 
will only happen once
+  per login. A UserLoginComplete call with direct=false can happen when the 
user visits the login
+  page while already logged in.
 
 'UserLoginForm': DEPRECATED! Create an AuthenticationProvider instead.
 Manipulate the login form.
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 3572229..0e4c6e0 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -208,7 +208,7 @@
 
// Deprecated hook
$injected_html = '';
-   Hooks::run( 'UserLoginComplete', [ &$user, 
&$injected_html ] );
+   Hooks::run( 'UserLoginComplete', [ &$user, 
&$injected_html, true ] );
 
$result['lguserid'] = intval( $user->getId() );
$result['lgusername'] = $user->getName();
diff --git a/includes/specials/SpecialCreateAccount.php 
b/includes/specials/SpecialCreateAccount.php
index d01751e..f06a192 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -129,7 +129,7 @@
# Run any hooks; display injected HTML
$injected_html = '';
$welcome_creation_msg = 'welcomecreation-msg';
-   Hooks::run( 'UserLoginComplete', [ &$user, &$injected_html ] );
+   Hooks::run( 'UserLoginComplete', [ &$user, &$injected_html, 
$direct ] );
 
/**
 * Let any extensions change what message is shown.
diff --git a/includes/specials/SpecialUserLogin.php 
b/includes/specials/SpecialUserLogin.php
index db20d87..21f5659 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -124,7 +124,7 @@
 
# Run any hooks; display injected HTML if any, else redirect
$injected_html = '';
-   Hooks::run( 'UserLoginComplete', [ &$user, &$injected_html ] );
+   Hooks::run( 'UserLoginComplete', [ &$user, &$injected_html, 
$direct ] );
 
if ( $injected_html !== '' || $extraMessages ) {
$this->showSuccessPage( 'success', $this->msg( 
'loginsuccesstitle' ),
diff --git a/includes/specials/pre-authmanager/SpecialUserlogin.php 
b/includes/specials/pre-authmanager/SpecialUserlogin.php
index 951cb52..09132f2 100644
--- a/includes/specials/pre-authmanager/SpecialUserlogin.php
+++ b/includes/specials/pre-authmanager/SpecialUserlogin.php
@@ -1262,7 +1262,8 @@
# Run any hooks; display injected HTML if any, else redirect
$currentUser = $this->getUser();
$injected_html = '';
-   Hooks::run( 'UserLoginComplete', [ &$currentUser, 
&$injected_html ] );
+   $direct = RequestContext::getMain()->getRequest()->wasPosted();
+   Hooks::run( 'UserLoginComplete', [ &$currentUser, 
&$injected_html, $direct ] );
 
if ( $injected_html !== '' ) {
$this->displaySuccessfulAction( 'success', $this->msg( 
'loginsuccesstitle' ),
@@ -1283,8 +1284,9 @@
$currentUser = $this->getUser();
$injected_html = '';
$welcome_creation_msg

[MediaWiki-commits] [Gerrit] Change-prop: Ignore bot edits on ORES precache updates. - change (operations/puppet)

2016-07-20 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review.

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

Change subject: Change-prop: Ignore bot edits on ORES precache updates.
..

Change-prop: Ignore bot edits on ORES precache updates.

ORES precaching doesn't need to be run on edits that were made
by bots, so updating the rules to exclude them.

Change-Id: I1898f484142d1ab9ffa432f2fb8e3611ba864e07
Depends-On: Ic79690da726698ee785e048cbb2959c731bd017d
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/300108/1

diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index eedf47f..8738be2 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -231,16 +231,19 @@
   - match:
   meta:
 domain: ar.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/arwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: cs.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/cswiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: en.wikipedia.org
+  rev_by_bot: false
 exec:
   - uri: '<%= @ores_uri 
%>/v2/scores/enwiki/damaging/{{message.rev_id}}/?precache=true'
   - uri: '<%= @ores_uri 
%>/v2/scores/enwiki/reverted/{{message.rev_id}}/?precache=true'
@@ -248,21 +251,25 @@
   - match:
   meta:
 domain: en.wiktionary.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/enwiktionary/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: es.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/eswiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: et.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/etwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: fa.wikipedia.org
+  rev_by_bot: false
 exec:
   - uri: '<%= @ores_uri 
%>/v2/scores/fawiki/damaging/{{message.rev_id}}/?precache=true'
   - uri: '<%= @ores_uri 
%>/v2/scores/fawiki/reverted/{{message.rev_id}}/?precache=true'
@@ -270,31 +277,37 @@
   - match:
   meta:
 domain: fr.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/frwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: he.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/hewiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: hu.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/huwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: id.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/idwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: it.wikipedia.org
+  rev_by_bot: false
 exec:
   uri: '<%= @ores_uri 
%>/v2/scores/itwiki/reverted/{{message.rev_id}}/?precache=true'
   - match:
   meta:
 domain: nl.wikipedia.org
+  rev_by_bot: false
 exec:
   - uri: '<%= @ores_uri 
%>/v2/scores/nlwiki/damaging/{{message.rev_id}}/?precache=true'
   - uri: '<%= @ores_uri

[MediaWiki-commits] [Gerrit] Bump src to ed2f8228 for deploy - change (mediawiki...deploy)

2016-07-20 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to ed2f8228 for deploy
..

Bump src to ed2f8228 for deploy

Change-Id: I6693350f6b11c6c9e4ae5613d305c6cfe464c694
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/07/300107/1

diff --git a/src b/src
index 45beb6c..ed2f822 16
--- a/src
+++ b/src
-Subproject commit 45beb6c0abc5a313ad75259053d74466a51f91cd
+Subproject commit ed2f82289e95690eb1d580994df6d6e2841a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6693350f6b11c6c9e4ae5613d305c6cfe464c694
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Fix calculations in PagedTiffHandler::getIntermediaryStep - change (mediawiki...PagedTiffHandler)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix calculations in PagedTiffHandler::getIntermediaryStep
..


Fix calculations in PagedTiffHandler::getIntermediaryStep

  - fix a division by zero when the source width
and the intermediary step are equal
  - avoid extraneous round function call just after floor

Bug: T108983
Change-Id: If620fe5bccc3022c2a72c938e8eb328372c94af9
(cherry picked from commit 7c17633cbdbe4f9a123e85c1fddf48cffa90d49d)
---
M PagedTiffHandler_body.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/PagedTiffHandler_body.php b/PagedTiffHandler_body.php
index 103bf29..cb65818 100644
--- a/PagedTiffHandler_body.php
+++ b/PagedTiffHandler_body.php
@@ -793,8 +793,8 @@
$srcWidth = $file->getWidth( $page );
$srcHeight = $file->getHeight( $page );
 
-   if ( $srcWidth < $wgTiffIntermediaryScaleStep ) {
-   // Image is already smaller than intermediary step
+   if ( $srcWidth <= $wgTiffIntermediaryScaleStep ) {
+   // Image is already smaller than intermediary step or 
at that step
return false;
}
 
@@ -803,16 +803,16 @@
// Try and get a width that's easy for VipsScaler to work with
// i.e. Is an integer shrink factor.
$rx = floor( $srcWidth / ( $wgTiffIntermediaryScaleStep + 0.125 
) );
-   $intermediaryWidth = intval( floor( $srcWidth / round( $rx ) ) 
);
-   $intermediaryHeight = intval( floor( $srcHeight / round( $rx ) 
) );
+   $intermediaryWidth = intval( floor( $srcWidth / $rx ) );
+   $intermediaryHeight = intval( floor( $srcHeight / $rx ) );
 
// We need both the vertical and horizontal shrink factors to be
// integers, and at the same time make sure that both vips and 
mediawiki
// have the same height for a given width (MediaWiki makes the 
assumption
// that the height of an image functionally depends on its 
width)
for ( ; $rx >= 2; $rx-- ) {
-   $intermediaryWidth = intval( floor( $srcWidth / round( 
$rx ) ) );
-   $intermediaryHeight = intval( floor( $srcHeight / 
round( $rx ) ) );
+   $intermediaryWidth = intval( floor( $srcWidth / $rx ) );
+   $intermediaryHeight = intval( floor( $srcHeight / $rx ) 
);
if ( $intermediaryHeight == File::scaleHeight( 
$srcWidth, $srcHeight, $intermediaryWidth ) ) {
break;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If620fe5bccc3022c2a72c938e8eb328372c94af9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PagedTiffHandler
Gerrit-Branch: wmf/1.28.0-wmf.11
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Mobile diffs should use OneColumnDifferenceEngine in core - change (mediawiki...MobileFrontend)

2016-07-20 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Mobile diffs should use OneColumnDifferenceEngine in core
..

Mobile diffs should use OneColumnDifferenceEngine in core

InlineDifferenceEngine now extends OneColumnDifferenceEngine
to allow us time to upstream/move the remaining methods used
by MobileDiff

Change-Id: I92ef57a1f1b5b293a4e10d53cecf47d8dd546cdc
Depends-On: Ib1b7f17d1099e2efb7edac7ba006e9b763135296
Bug: T117279
---
M extension.json
D includes/diff/InlineDiffFormatter.php
M includes/diff/InlineDifferenceEngine.php
3 files changed, 1 insertion(+), 182 deletions(-)


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

diff --git a/extension.json b/extension.json
index da337ca..442cd10 100644
--- a/extension.json
+++ b/extension.json
@@ -79,7 +79,6 @@
"MobileUI": "includes/MobileUI.php",
"ApiMobileView": "includes/api/ApiMobileView.php",
"ApiParseExtender": "includes/api/ApiParseExtender.php",
-   "InlineDiffFormatter": "includes/diff/InlineDiffFormatter.php",
"InlineDifferenceEngine": 
"includes/diff/InlineDifferenceEngine.php",
"MobileSiteModule": "includes/modules/MobileSiteModule.php",
"MobileUserModule": "includes/modules/MobileUserModule.php",
diff --git a/includes/diff/InlineDiffFormatter.php 
b/includes/diff/InlineDiffFormatter.php
deleted file mode 100644
index 86da38a..000
--- a/includes/diff/InlineDiffFormatter.php
+++ /dev/null
@@ -1,135 +0,0 @@
-\n";
-   }
-
-   /**
-* Get a div element with a complete new added line as content.
-* Complete line will be appear with green background.
-* @param array $lines With changed lines
-*/
-   function added( $lines ) {
-   foreach ( $lines as $line ) {
-   $this->writeOutput( ''
-   . $this->lineOrNbsp( htmlspecialchars( $line ) )
-   . "\n" );
-   }
-   }
-
-   /**
-* Get a div with a line which is deleted completly.
-* This line will be appear with complete red background.
-* @param array $lines With deleted lines
-*/
-   function deleted( $lines ) {
-   foreach ( $lines as $line ) {
-   $this->writeOutput( ''
-   . $this->lineOrNbsp( htmlspecialchars( $line ) )
-   . "\n" );
-   }
-   }
-
-   /**
-* Get a div with some changed content.
-* Line will appear with white and the changed context in
-* red (for deleted chars) and green (for added chars) background.
-* @param array $lines With edited lines
-*/
-   function context( $lines ) {
-   foreach ( $lines as $line ) {
-   $this->writeOutput( "" .
-   "{$this->contextLine( htmlspecialchars( $line ) 
)}\n" );
-   }
-   }
-
-   /**
-* Convert all spaces to a forced blank. If line is empty creates at 
least one
-* forced space.
-* @param string $marker Unused
-* @param string $class Unused
-* @param string $line Content of the line
-* @return string
-*/
-   protected function wrapLine( $marker, $class, $line ) {
-   // The  wrapper is needed for 'overflow: auto' style to 
scroll properly
-   $this->escapeWhiteSpace( $this->lineOrNbsp( $line ) );
-
-   return $line;
-   }
-
-   /**
-* Adds a forced blank to line, if the line is empty.
-* @param string $line
-*
-* @return string
-*/
-   protected function lineOrNbsp( $line ) {
-   if ( $line === '' ) {
-   $line = '';
-   }
-
-   return $line;
-   }
-
-   /**
-* Get a div with changed content (not complete added or deleted line)
-* @param string[] $orig Old content to compare with
-* @param string[] $closing New content to compare with
-*/
-   function changed( $orig, $closing ) {
-   $this->writeOutput( '' );
-   $diff = new WordLevelDiff( $orig, $closing );
-   $edits = $this->inlineWordDiff( $diff );
-
-   # WordLevelDiff returns already HTML-escaped output.
-   $this->writeOutput( implode( '', $edits ) );
-
-   $this->writeOutput( "\n" );
-   }
-
-   /**
-* Builds the string of deleted and added words from the given diff.
-* @param WordLevelDiff $diff
-* @return array Array of changed lines
-*/
-   private function inlineWordDiff( $diff ) {
-   $inline = new WordAccumulator;
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

And update vendor

8a27d2c Merge "Update SmashPig and config handling"
0fdc947 Update SmashPig and config handling
d1f20cc Add 'Endowment Gift' to Financial types
5b4cf59 Add 'Endowment Gift' to gift source.
1675fb0 Rename unmagical validation hook
435326c T137569 Allow Engage users to enter Benefactor Give into Gift Source

Change-Id: I77294adde9a3ac6ef29b77fbcc3a7ab1b152c10c
---
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
M vendor
2 files changed, 0 insertions(+), 169 deletions(-)

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



diff --git a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php 
b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
deleted file mode 100644
index c5746fb..000
--- a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD   (a386eb Merge master into deployment)
-===
- __DIR__ . '/data/logs/',
-   'amazon_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'amazon_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['amazon_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'amazon_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'amazon', 'P01-4968629-7654321-C070794' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 2476135333,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lu...@yahoo.com',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-4968629-7654321-C070794',
-   'gross' => 1.00,
-   'payment_method' => 'amazon',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   $api = civicrm_api_classapi();
-   $api->Contribution->Delete( array(
-   'id' => $this->contribution_id,
-   'version' => 3,
-   ) );
-   $api->Contact->Delete( array(
-   'id' => $this->contact_id,
-   'version' => 3,
-   ) );
-   parent::tearDown();
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Amazon/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'87654321',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1443723034,
-   'email' => 
'nonchal...@gmail.com',
-   'fee' => '0.59',
-   'first_name' => 'Test',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-1488694-1234567-C034811',
-   'gross' => '10.00',
-   'language' => 'en',
-   'last_name' => 'Person',
-   'payment_method' => 'amazon',
-

[MediaWiki-commits] [Gerrit] Remove OATHAuth from wikitech's extension-list, it's in prod - change (operations/mediawiki-config)

2016-07-20 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Remove OATHAuth from wikitech's extension-list, it's in prod
..

Remove OATHAuth from wikitech's extension-list, it's in prod

Change-Id: I997ff2edb600cdd6a30dd2266727dc4cb7d0a11e
---
M wmf-config/extension-list-wikitech
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/extension-list-wikitech 
b/wmf-config/extension-list-wikitech
index 21f05be..3fe18c7 100644
--- a/wmf-config/extension-list-wikitech
+++ b/wmf-config/extension-list-wikitech
@@ -1,6 +1,5 @@
 $IP/extensions/DynamicSidebar/extension.json
 $IP/extensions/LdapAuthentication/LdapAuthentication.php
-$IP/extensions/OATHAuth/extension.json
 $IP/extensions/OpenStackManager/OpenStackManager.php
 $IP/extensions/Validator/Validator.php
 $IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I997ff2edb600cdd6a30dd2266727dc4cb7d0a11e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: update DonationInterface submodule
..


update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index fcd3fd4..33dd4ab 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit fcd3fd466bfe821ffeb8a67eac72924e186e0eab
+Subproject commit 33dd4aba5d4e4dbef1e8b4e130cb3c95f3b3d8f9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2da8357f6ee8c7f7e36346600bbd887987553727
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] build: Bring in composer to test phpcs - change (mediawiki...FileAnnotations)

2016-07-20 Thread jenkins-bot (Code Review)

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

Change subject: build: Bring in composer to test phpcs
..


build: Bring in composer to test phpcs

Change-Id: Id50d3c3f86c4df7c89c522f6c159c4d40f60e7ff
---
M FileAnnotations.hooks.php
A composer.json
A phpcs.xml
3 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/FileAnnotations.hooks.php b/FileAnnotations.hooks.php
index 4ebe9bf..79d9f39 100644
--- a/FileAnnotations.hooks.php
+++ b/FileAnnotations.hooks.php
@@ -32,7 +32,7 @@
 
public static function getModulesForFilePage( &$out, &$skin ) {
if ( $out->getTitle()->inNamespace( NS_FILE ) ) {
-   $out->addModules( array( 'fileannotations' ) );
+   $out->addModules( [ 'fileannotations' ] );
}
}
 
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..4653c05
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,15 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ],
+   "fix": [
+   "phpcbf"
+   ]
+   }
+}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id50d3c3f86c4df7c89c522f6c159c4d40f60e7ff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FileAnnotations
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 357 matches

Mail list logo