date:20161227

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Avoid use of &$this in hooks

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329341 )

Change subject: EditPage: Avoid use of &$this in hooks
..


EditPage: Avoid use of &$this in hooks

* This triggers warnings in PHP 7.1

Bug: T153505
Change-Id: I5324a6bfe9e8ed255975104c5de7e7a7011cb741
---
M includes/EditPage.php
1 file changed, 20 insertions(+), 6 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1f871e1..c11df5d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2602,7 +2602,9 @@
$previewOutput = $this->getPreviewText();
}
 
-   Hooks::run( 'EditPage::showEditForm:initial', [ &$this, &$wgOut 
] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPage::showEditForm:initial', [ &$editPage, 
&$wgOut ] );
 
$this->setHeaders();
 
@@ -2679,7 +2681,9 @@
. Xml::closeElement( 'div' )
);
 
-   Hooks::run( 'EditPage::showEditForm:fields', [ &$this, &$wgOut 
] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPage::showEditForm:fields', [ &$editPage, 
&$wgOut ] );
 
// Put these up at the top to ensure they aren't lost on early 
form submission
$this->showFormBeforeText();
@@ -3541,7 +3545,9 @@
protected function showConflict() {
global $wgOut;
 
-   if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, 
&$wgOut ] ) ) {
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$editPage, 
&$wgOut ] ) ) {
$stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
$stats->increment( 'edit.failures.conflict' );
// Only include 'standard' namespaces to avoid creating 
unknown numbers of statsd metrics
@@ -4069,7 +4075,10 @@
$checkboxes['watch'] = $watchThisHtml;
}
}
-   Hooks::run( 'EditPageBeforeEditChecks', [ &$this, &$checkboxes, 
&$tabindex ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageBeforeEditChecks', [ &$editPage, 
&$checkboxes, &$tabindex ] );
return $checkboxes;
}
 
@@ -4118,7 +4127,9 @@
$buttons['diff'] = Html::submitButton( $this->context->msg( 
'showdiff' )->text(),
$attribs );
 
-   Hooks::run( 'EditPageBeforeEditButtons', [ &$this, &$buttons, 
&$tabindex ] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageBeforeEditButtons', [ &$editPage, 
&$buttons, &$tabindex ] );
return $buttons;
}
 
@@ -4132,7 +4143,10 @@
$wgOut->prepareErrorPage( $this->context->msg( 
'nosuchsectiontitle' ) );
 
$res = $this->context->msg( 'nosuchsectiontext', $this->section 
)->parseAsBlock();
-   Hooks::run( 'EditPageNoSuchSection', [ &$this, &$res ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageNoSuchSection', [ &$editPage, &$res ] );
$wgOut->addHTML( $res );
 
$wgOut->returnToMain( false, $this->mTitle );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5324a6bfe9e8ed255975104c5de7e7a7011cb741
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DPLforum[master]: Replaced deprecated "Linker::link"

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329342 )

Change subject: Replaced deprecated "Linker::link"
..


Replaced deprecated "Linker::link"

Bug: T149346
Change-Id: I6f66d48387dccdc34cf3df579eac3a473c660042
---
M DPLforum_body.php
1 file changed, 12 insertions(+), 10 deletions(-)

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



diff --git a/DPLforum_body.php b/DPLforum_body.php
index 78a9ef6..96df7d4 100644
--- a/DPLforum_body.php
+++ b/DPLforum_body.php
@@ -25,6 +25,8 @@
  * @ingroup Extensions
  */
 
+ use MediaWiki\MediaWikiServices;
+
 if ( !defined( 'MEDIAWIKI' ) ) {
echo( "This file is an extension to the MediaWiki software and is not a 
valid access point" );
die( 1 );
@@ -464,7 +466,7 @@
function buildOutput( $page, $title, $time, $user = '', $author = '', 
$made = '' ) {
$tableMode =& $this->bTableMode;
$output = '';
-
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
if ( $this->bAddCreationDate ) {
if ( is_numeric( $made ) ) {
$made = $this->date( $made, 'date', 
$this->sCreationDateFormat );
@@ -472,10 +474,10 @@
 
if ( $page && $this->bLinkHistory && 
!$this->bAddLastEdit ) {
if ( $this->bEmbedHistory ) {
-   $made = Linker::link( $page, $made, 
array(), array( 'action' => 'history' ), array( 'known' ) );
+   $made = $linkRenderer->makeLink( $page, 
$made, array(), array( 'action' => 'history' ), array( 'known' ) );
} else {
-   $made .= ' (' . Linker::link( $page,
-   wfMessage( 'hist' )->escaped(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
+   $made .= ' (' . 
$linkRenderer->makeLink( $page,
+   wfMessage( 'hist' )->text(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
}
}
 
@@ -511,14 +513,14 @@
}
}
 
-   $output .= Linker::link( $title, $text, $props, $query, array( 
'known' ) );
+   $output .= $linkRenderer->makeLink( $title, $text, $props, 
$query, array( 'known' ) );
$text = '';
 
if ( $this->bAddAuthor ) {
$author = Title::newFromText( $author, NS_USER );
 
if ( $author ) {
-   $author = Linker::link( $author, 
$author->getText(), array(), array(), array( 'known' ) );
+   $author = $linkRenderer->makeLink( $author, 
$author->getText(), array(), array(), array( 'known' ) );
}
 
if ( $tableMode ) {
@@ -545,10 +547,10 @@
 
if ( $page && $this->bLinkHistory ) {
if ( $this->bEmbedHistory ) {
-   $time = Linker::link( $page, $time, 
array(), array( 'action' => 'history' ), array( 'known' ) );
+   $time = $linkRenderer->makeLink( $page, 
$time, array(), array( 'action' => 'history' ), array( 'known' ) );
} else {
-   $time .= ' (' . Linker::link( $page,
-   wfMessage( 'hist' )->escaped(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
+   $time .= ' (' . 
$linkRenderer->makeLink( $page,
+   wfMessage( 'hist' )->text(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
}
}
 
@@ -563,7 +565,7 @@
$user = Title::newFromText( $user, NS_USER );
 
if ( $user ) {
-   $user = Linker::link( $user, $user->getText(), 
array(), array(), array( 'known' ) );
+   $user = $linkRenderer->makeLink( $user, 
$user->getText(), array(), array(), array( 'known' ) );
}
 
if ( $tableMode ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f66d48387dccdc34cf3df579eac3a473c660042
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DPLforum
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Add parent and banner fields to projects table

2016-12-27 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329386 )

Change subject: Add parent and banner fields to projects table
..

Add parent and banner fields to projects table

Bug: T154216
Change-Id: I2bae8b3e0bf67087e304fde38df1438908b07067
---
M PageAssessments.hooks.php
M db/addProjectsTable.sql
A db/patch-parent-and-banner-fields.sql
3 files changed, 5 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments 
refs/changes/86/329386/1

diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 5c86259..0df51f0 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -67,6 +67,7 @@
$dbDir = __DIR__ . '/db';
$updater->addExtensionUpdate( array( 'addTable', 
'page_assessments_projects', "$dbDir/addProjectsTable.sql", true ) );
$updater->addExtensionUpdate( array( 'addTable', 
'page_assessments', "$dbDir/addReviewsTable.sql", true ) );
+   $updater->addExtensionUpdate( array( 'addField', 
'page_assessments_projects', 'pap_parent', 
"$dbDir/patch-parent-and-banner-fields.sql", true ) );
}
 
/**
diff --git a/db/addProjectsTable.sql b/db/addProjectsTable.sql
index 576e010..58991c3 100644
--- a/db/addProjectsTable.sql
+++ b/db/addProjectsTable.sql
@@ -3,6 +3,8 @@
 CREATE TABLE IF NOT EXISTS /*_*/page_assessments_projects (
   pap_project_id  INT UNSIGNED NOT NULL AUTO_INCREMENT,  -- generated ID 
of the project
   pap_project_title   VARCHAR(128) DEFAULT NULL, -- name of the 
project assessing the page
+  pap_parent  INT UNSIGNED NULL DEFAULT NULL,-- id of parent 
project (for task forces)
+  pap_banner  VARCHAR(255) NULL DEFAULT NULL,-- title of 
banner template (without namespace)
   PRIMARY KEY (pap_project_id)
 )/*$wgDBTableOptions*/;
 
diff --git a/db/patch-parent-and-banner-fields.sql 
b/db/patch-parent-and-banner-fields.sql
new file mode 100644
index 000..eba113a
--- /dev/null
+++ b/db/patch-parent-and-banner-fields.sql
@@ -0,0 +1,2 @@
+ALTER TABLE /*_*/page_assessments_projects ADD COLUMN pap_parent INT UNSIGNED 
NULL DEFAULT NULL; -- id of parent project (for task forces)
+ALTER TABLE /*_*/page_assessments_projects ADD COLUMN pap_banner VARCHAR(255) 
NULL DEFAULT NULL; -- title of banner template (without namespace)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bae8b3e0bf67087e304fde38df1438908b07067
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] mediawiki...DeepSea[master]: Fix my author name

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329385 )

Change subject: Fix my author name
..


Fix my author name

Change-Id: I9fd5e2c9d3411916e4b29c6aa3a149b573ec2af1
---
M i18n/vi.json
M skin.json
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/i18n/vi.json b/i18n/vi.json
index 088a200..9d36535 100644
--- a/i18n/vi.json
+++ b/i18n/vi.json
@@ -1,6 +1,8 @@
 {
"@metadata": {
-   "authors": [ "Codyn329" ]
+   "authors": [
+   "Samantha Nguyen" 
+   ]
},
"deepsea-advertisement": "Quảng cáo",
 "deepsea-chat": "Trò chuyện",
diff --git a/skin.json b/skin.json
index 0b032e5..d53f6ec 100644
--- a/skin.json
+++ b/skin.json
@@ -5,7 +5,7 @@
"author": [
"[https://mediawiki.org/wiki/User:UltrasonicNXT Adam Carter]",
"[https://mediawiki.org/wiki/User:GeorgeBarnick George 
Barnick]",
-   "[https://mediawiki.org/wiki/User:Codynguyen1116 Cody Nguyen]"
+   "[https://mediawiki.org/wiki/User:SamanthaNguyen Samantha 
Nguyen]"
],
"url": "https://www.mediawiki.org/wiki/Skin:DeepSea;,
"descriptionmsg": "deepsea-desc",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fd5e2c9d3411916e4b29c6aa3a149b573ec2af1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeepSea
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DeepSea[master]: Fix my author name

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329385 )

Change subject: Fix my author name
..

Fix my author name

Change-Id: I9fd5e2c9d3411916e4b29c6aa3a149b573ec2af1
---
M i18n/vi.json
M skin.json
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeepSea 
refs/changes/85/329385/1

diff --git a/i18n/vi.json b/i18n/vi.json
index 088a200..9d36535 100644
--- a/i18n/vi.json
+++ b/i18n/vi.json
@@ -1,6 +1,8 @@
 {
"@metadata": {
-   "authors": [ "Codyn329" ]
+   "authors": [
+   "Samantha Nguyen" 
+   ]
},
"deepsea-advertisement": "Quảng cáo",
 "deepsea-chat": "Trò chuyện",
diff --git a/skin.json b/skin.json
index 0b032e5..d53f6ec 100644
--- a/skin.json
+++ b/skin.json
@@ -5,7 +5,7 @@
"author": [
"[https://mediawiki.org/wiki/User:UltrasonicNXT Adam Carter]",
"[https://mediawiki.org/wiki/User:GeorgeBarnick George 
Barnick]",
-   "[https://mediawiki.org/wiki/User:Codynguyen1116 Cody Nguyen]"
+   "[https://mediawiki.org/wiki/User:SamanthaNguyen Samantha 
Nguyen]"
],
"url": "https://www.mediawiki.org/wiki/Skin:DeepSea;,
"descriptionmsg": "deepsea-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fd5e2c9d3411916e4b29c6aa3a149b573ec2af1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeepSea
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Remove support for

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329384 )

Change subject: Remove support for  tags with right margins and nowrap 
*/
-   margin-right: 0;
-}
diff --git a/truglass/Opera6Fixes.css b/truglass/Opera6Fixes.css
deleted file mode 100644
index 8870473..000
--- a/truglass/Opera6Fixes.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* opera 6 fixes */
-#column-one {
-   position: relative;
-   max-width: 11.7em;
-}
-#p-personal {
-   width: 45em;
-   margin-left: 8.6em;
-   right: 0;
-}
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/Opera7Fixes.css b/truglass/Opera7Fixes.css
deleted file mode 100644
index 446ea44..000
--- a/truglass/Opera7Fixes.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* small tweaks for opera seven */
-#p-cactions {
-   margin-top: .1em;
-}
-#p-cactions li a {
-   top: 2px;
-}
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/Opera95Fixes.css b/truglass/Opera95Fixes.css
deleted file mode 100644
index 6048c66..000
--- a/truglass/Opera95Fixes.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * One tweak for Opera 9.5 carried over from Opera 7.  This seems to be exactly
- * the same rule as is used for #bodyContent a.external normally, why do we
- * need it?  Someone should compare with and without and remove this file en-
- * tirely if appropriate.
- */
-#bodyContent a.external {
-   background: url(external.png) center right no-repeat;
-   padding-right: 13px;
-}
diff --git a/truglass/rtl.css b/truglass/rtl.css
deleted file mode 100644
index 8114f4b..000
--- a/truglass/rtl.css
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-Right-to-left fixes for MonoBook.
-Places sidebar on right, tweaks various alignment issues.
-
-Works mostly ok nicely on Safari 1.2.1; fine in Mozilla.
-
-Safari bugs (1.2.1):
-* Tabs are still appearing in left-to-right order. (Try after localizing)
-
-Opera bugs (7.23 linux):
-* Some bits of ltr text (sidebar box titles) have forward and backward 
versions overlapping each other
-
-IE/mac bugs:
-* The thing barfs on Hebrew and Arabic anyway, so no point testing.
-
-Missing features due to lack of support:
-* external link icons
-
-To test:
-* Opera6
-* IE 5.0
-* etc
-
-*/
-body {
-   direction: rtl;
-/*unicode-bidi: bidi-override;*/
-   unicode-bidi: embed;
-}
-#column-content {
-   margin: 0 -12.2em 0 0;
-   float: left;
-}
-#column-content #content{
-   margin-left: 0;
-   margin-right: 12.2em;
-   border-right: 1px solid #aa;
-   border-left: none;
-}
-html>body .portlet {
-   float: right;
-   clear: right;
-}
-.editsection {
-   float: left;
-   margin-right: 5px;
-   margin-left: 0; /* bug 9122: undo default LTR */
-}
-/* recover IEMac (might be fine with the float, but usually it's close to IE */
-*>body .portlet {
-   float: none;
-   clear: none;
-}
-.pBody {
-   padding-right: 0.8em;
-   padding-left: 0.5em;
-}
-
-/* Fix alignment */
-.documentByLine,
-.portletDetails,
-.portletMore,
-#p-personal {
-   text-align: left;
-}
-
-div div.thumbcaption {
-   text-align: right;
-}
-
-div.magnify,
-#p-logo {
-   left: auto;
-   right: 0;
-}
-#p-personal {
-   left: auto;
-   right: 0;
-}
-
-#p-cactions {
-   left: auto;
-   right: 11.5em;
-   padding-left: 0;
-   padding-right: 1em;
-}
-#p-cactions li {
-   margin-left: 0.3em;
-   margin-right: 0;
-   float: right;
-}
-* html #p-cactions li a {
-   display: block;
-   padding-bottom: 0;
-}
-* html #p-cactions li a:hover {
-   padding-bottom: 0.2em;
-}
-/* offsets to distinguish the tab groups */
-li#ca-talk {
-   margin-right: auto;
-   margin-left: 1.6em;
-}
-li#ca-watch,li#ca-unwatch {
-   margin-right: 1.6em !important;
-}
-
-/* Fix margins for non-css2 browsers */
-/* top right bottom left */
-
-ul {
-   margin-left: 0;
-   margin-right: 1.5em;
-}
-ol {
-   margin-left: 0;
-   margin-right: 2.4em;
-}
-dd {
-   margin-left: 0;
-   margin-right: 1.6em;
-}
-#contentSub {
-   margin-right: 1em;
-   margin-left: 0;
-}
-.tocindent {
-   margin-left: 0;
-   margin-right: 2em;
-}
-div.tright, div.floatright, table.floatright {
-   clear: none;
-}
-div.tleft, div.floatleft, table.floatleft {
-   clear: left;
-}
-
-#p-personal li {
-   margin-left: 0;
-   margin-right: 1em;
-}
-
-li#ca-talk,
-li#ca-watch {
-   margin-right: auto;
-   margin-left: 1.6em;
-}
-
-#p-personal li {
-   float: left;
-}
-/* Fix link icons */
-.external {
-   padding: 0 !important;
-   background: none !important;
-}
-#footer {
-   clear: both;
-}
-* html #footer {
-   margin-left: 0;
-   margin-right: 13.6em;
-   border-left: 0;
-   border-right: 1px

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Organize CSS, deleting stylesheets, remove old IE support

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329383 )

Change subject: Organize CSS, deleting stylesheets, remove old IE support
..

Organize CSS, deleting stylesheets, remove old IE support

- Removed "editor-style.css" and "ie.css", since they
weren't being loaded anyways.
- Removed some specific lines that were for supporting
ancient versions of IE(6!), and organized stylesheets
by moving resets and wordpress-rules into their own
stylehseets.
- Bumped up version number (major change)

Bug: T154200
Change-Id: I2092fe681ef3b68ffe80b63b64fb0674c5c4e75c
---
D css/editor-style.css
D css/ie.css
A css/reset.css
M css/style.css
A css/wordpress-rules.css
M skin.json
6 files changed, 78 insertions(+), 401 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored 
refs/changes/83/329383/1

diff --git a/css/editor-style.css b/css/editor-style.css
deleted file mode 100644
index 01a45f8..000
--- a/css/editor-style.css
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-Editor-Style CSS for ...
-Theme Name: Desk Mess Mirrored
-Theme URI: http://buynowshop.com/themes/desk-mess-mirrored/
-Version: 2.0
-Author: Edward Caissie
-Author URI: http://edwardcaissie.com/
-License: GNU General Public License v2
-License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-*/
-
-/**
- * Copyright 2009-2012  Edward Caissie  (email : edward.cais...@gmail.com)
- *
- * This program is free software; you can redistribute it and/or modify it 
under
- * the terms of the GNU General Public License version 2, as published by the
- * Free Software Foundation.
- *
- * You may NOT assume that you can use any other version of the GPL.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
details
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to:
- *
- *  Free Software Foundation, Inc.
- *  51 Franklin St, Fifth Floor
- *  Boston, MA  02110-1301  USA
- *
- * The license for this software can also likely be found here:
- * http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/**
- * See index.php for additional program documentation and license information
- * references.
- */
-
-/*-- YUI Reset: Start --*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td
 { margin: 0; padding: 0; }
-table { border-collapse: collapse; border-spacing: 0; }
-fieldset,img { border: 0; }
-address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; 
font-weight: normal; }
-ol,ul { list-style: none; }
-caption,th { text-align: left; }
-h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; }
-q:before,q:after { content: ''; }
-abbr,acronym { border:0; }
-/*-- YUI Reset: End --*/
-
-/*-- WordPress Rules --*/
-div.aligncenter, .aligncenter, .center { margin: 0 auto; }
-.alignleft, .left { float: left; text-align: left; }
-.alignright, .right { float: right; text-align: right; }
-img.aligncenter, img.center { display: block; }
-img.alignleft, img.left { display: inline; margin: 0 8px 8px 0; }
-img.alignright, img.right { display: inline; margin: 0 0 8px 8px; }
-.wp-caption { border: 1px solid #ddd; text-align: center; background-color: 
#f3f3f3; padding-top: 4px; margin: 10px;
-/* optional rounded corners for browsers that support it */
-   -moz-border-radius: 3px;
-   -khtml-border-radius: 3px;
-   -webkit-border-radius: 3px;
-   -border-radius: 3px;
-}
-.wp-caption img { margin: 0; padding: 0; border: 0 none; }
-.wp-caption p.wp-caption-text { font-size: 11px; line-height: 17px; padding: 0 
4px 5px; margin: 0; }
-/*-- End WordPress Rules --*/
-
-/*-- Begin TinyMCE --*/
-html .mceContentBody {
-   max-width: 580px;
-   margin: 0;
-   padding: 0;
-   font-family: "Lucida Grande", "Lucida Sans Unicode", sans-serif;
-   font-size: 14px;
-   line-height: 21px;
-}
-
-a:link, a:visited { color: #d21600; text-decoration: none; }
-a:hover { text-decoration: underline; }
-a:focus, a:active { color: #d21600; text-decoration: none; }
-
-a img { border: none; }
-
-em { font-style: italic; }
-
-h1, h2, h3, h4, h5, h6 {
-   font-family: Georgia, "Times New Roman", Times, serif;
-   font-weight: normal;
-   line-height: normal;
-}
-
-h1 {
-   font-size: 25px;
-   padding-bottom: 2px;
-}
-h2 {
-   font-size: 20px;
-   padding-bottom: 11px;
-   padding-top: 15px;
-}
-h3 {
-   font-size: 17px;
-   padding-bottom: 10px;
-   padding-top: 14px;
-}
-h4 {
-   font-size: 15px;
-   padding-bottom: 10px;
-   padding-top: 12px;
-}
-h5 {
-   font-size: 13px;
-   padding-bottom: 10px;
-   padding-top:

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: Added a composer.json file in order to lint the PHP

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329236 )

Change subject: Added a composer.json file in order to lint the PHP
..


Added a composer.json file in order to lint the PHP

* Ran phpcbf locally to clean up the code

Bug: T154147
Change-Id: I5a787952de804978709cde5ae159f19410e72297
---
M ApiLifeWeb.php
M LifeWeb.i18n.php
M LifeWeb.php
M SpecialLifeWeb.php
A composer.json
M lib/LifeWeb/Character.php
M lib/LifeWeb/Collection.php
M lib/LifeWeb/Component.php
M lib/LifeWeb/Degree.php
M lib/LifeWeb/Difficulty.php
M lib/LifeWeb/EntityIDs.php
M lib/LifeWeb/Equipment.php
M lib/LifeWeb/LWItem.php
M lib/LifeWeb/Query.php
M lib/LifeWeb/Question.php
M lib/LifeWeb/Taxon.php
M lib/LifeWeb/Topic.php
A phpcs.xml
18 files changed, 895 insertions(+), 887 deletions(-)

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



diff --git a/ApiLifeWeb.php b/ApiLifeWeb.php
index 7b2dc13..f70cc1b 100644
--- a/ApiLifeWeb.php
+++ b/ApiLifeWeb.php
@@ -7,112 +7,112 @@
 
 class ApiLifeWeb extends \ApiQueryBase {
 
-public function execute() {
-$result = $this->getResult();
+   public function execute() {
+   $result = $this->getResult();
 
-$params = $this->extractRequestParams();
-if ($params['what'] == 'taxonData') {
-$result->addValue(null, 'taxonData', 
\LifeWeb\Taxon::getTaxonData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   $params = $this->extractRequestParams();
+   if ( $params['what'] == 'taxonData' ) {
+   $result->addValue( null, 'taxonData', 
\LifeWeb\Taxon::getTaxonData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'characterData') {
-$result->addValue(null, 'characterData', 
\LifeWeb\Character::getCharacterData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'characterData' ) {
+   $result->addValue( null, 'characterData', 
\LifeWeb\Character::getCharacterData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'questionData') {
-$result->addValue(null, 'questionData', 
\LifeWeb\Question::getQuestionData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'questionData' ) {
+   $result->addValue( null, 'questionData', 
\LifeWeb\Question::getQuestionData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'degreeData') {
-$result->addValue(null, 'degreeData', 
\LifeWeb\Degree::getDegreeData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'degreeData' ) {
+   $result->addValue( null, 'degreeData', 
\LifeWeb\Degree::getDegreeData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'equipmentData') {
-$result->addValue(null, 'equipmentData', 
\LifeWeb\Equipment::getEquipmentData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'equipmentData' ) {
+   $result->addValue( null, 'equipmentData', 
\LifeWeb\Equipment::getEquipmentData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'difficultyData') {
-$result->addValue(null, 'difficultyData', 
\LifeWeb\Difficulty::getDifficultyData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'difficultyData' ) {
+   $result->addValue( null, 'difficultyData', 
\LifeWeb\Difficulty::getDifficultyData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'collectionData') {
-$result->addValue(null, 'collectionData', 
\LifeWeb\Collection::getCollectionData($params['clearCache']));
-$result->addValue(null, 'ok', 'true');
+   } elseif ( $params['what'] == 'collectionData' ) {
+   $result->addValue( null, 'collectionData', 
\LifeWeb\Collection::getCollectionData( $params['clearCache'] ) );
+   $result->addValue( null, 'ok', 'true' );
 
-} else if ($params['what'] == 'componentData') {
-$result->addValue(null, 'componentData', 
\LifeWeb\Component::getComponentData($params['clearCache']));
-$result->addValue(null,

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Use exported resources for ssh host keys

2016-12-27 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329382 )

Change subject: Tools: Use exported resources for ssh host keys
..

Tools: Use exported resources for ssh host keys

In the past, Tools used the central Labs puppetmaster that did not and
does not support exported resources.  Therefore each instance needed
to store its ssh host key on a NFS share where it was processed from
by all others.

Tools has since switched to its own puppetmaster where exported
resources are available.  This change makes use of that and shares ssh
host keys with the same manifests used in production.

As Labs instances do not have IPv6 addresses, this change also amends
the template for /etc/ssh/ssh_known_hosts to handle host aliases that
are undefined.

Bug: T153163
Change-Id: Iee22dab01af78f38103743644061e4387d254d12
---
M modules/ssh/manifests/client.pp
M modules/ssh/templates/known_hosts.erb
M modules/toollabs/manifests/init.pp
3 files changed, 24 insertions(+), 37 deletions(-)


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

diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 8cf8808..cbd7797 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -3,24 +3,23 @@
 ensure => present,
 }
 
-# no exported resources on Labs == no sshknowngen
-if $::realm == 'production' {
-if $::use_puppetdb {
-file { '/etc/ssh/ssh_known_hosts':
-content => template('ssh/known_hosts.erb'),
-backup  => false,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-}
-} else {
-file { '/etc/ssh/ssh_known_hosts':
-content => generate('/usr/local/bin/sshknowngen'),
-backup  => false,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-}
+if $::use_puppetdb {
+file { '/etc/ssh/ssh_known_hosts':
+content => template('ssh/known_hosts.erb'),
+backup  => false,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+}
+} elsif $::realm == 'production' {
+# The central Labs puppetmaster does not support exported
+# resources, so sshknowngen would not work there.
+file { '/etc/ssh/ssh_known_hosts':
+content => generate('/usr/local/bin/sshknowngen'),
+backup  => false,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
 }
 }
 }
diff --git a/modules/ssh/templates/known_hosts.erb 
b/modules/ssh/templates/known_hosts.erb
index 799114a..682fc11 100644
--- a/modules/ssh/templates/known_hosts.erb
+++ b/modules/ssh/templates/known_hosts.erb
@@ -2,7 +2,8 @@
 <%-
 scope.function_query_resources([false, '@@Sshkey', false, 'title asc']).each 
do |resource|
   parameters = resource['parameters']
-  aliases = parameters['host_aliases'].select{ |el| el !~ /^---/}.join(',')
+  aliases = parameters['host_aliases'].select{ |el| el !~ /^---/ && el != 
'undef'}.join(',')
+
   if parameters['ensure'] == 'present' -%>
 <%= resource['certname'] %>,<%= aliases %> <%= parameters['type'] %> <%= 
parameters['key'] %>
 <%-
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index a590802..a170340 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -70,28 +70,15 @@
 require => File[$sysdir],
 }
 
+# TODO: Remove after Puppet cycle.
 file { "${store}/hostkey-${::fqdn}":
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-content => "${::fqdn},${::hostname},${::ipaddress} ssh-rsa 
${::sshrsakey}\n${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256 
${::sshecdsakey}\n",
+ensure  => absent,
 require => File[$store],
 }
 
-exec { 'make_known_hosts':
-command => "/bin/cat ${store}/hostkey-* >/etc/ssh/ssh_known_hosts~",
-onlyif  => "/usr/bin/test -n \"\$(/usr/bin/find ${store} -maxdepth 1 
\\( -type d -or -type f -name hostkey-\\* \\) -newer 
/etc/ssh/ssh_known_hosts~)\" -o ! -s /etc/ssh/ssh_known_hosts~",
-require => File[$store],
-}
-
-file { '/etc/ssh/ssh_known_hosts':
-ensure  => file,
-source  => '/etc/ssh/ssh_known_hosts~',
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-require => Exec['make_known_hosts'],
+# TODO: Remove after Puppet cycle.
+file { '/etc/ssh/ssh_known_hosts~':
+ensure => absent,
 }
 
 File['/var/lib/gridengine'] -> Package <| title == 'gridengine-common' |>

-- 
To view, visit

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: DEPLOYMENT ONLY: fix broken hack :(

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329381 )

Change subject: DEPLOYMENT ONLY: fix broken hack :(
..


DEPLOYMENT ONLY: fix broken hack :(

Change-Id: I309f089c70e458ee222c66a9a0d6171fa98d9685
---
M Core/Http/RequestHandler.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index f96efe2..7112439 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -23,15 +23,15 @@
// Can go away once we require PHP 5.6
ini_set( 'default_charset', 'UTF-8' );
 
-// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
-$response->setStatusCode( 403, "Cannot continue." );
-return $response;
-
// --- Get the request and response objects
$request = Request::createFromGlobals();
$response = new Response();
$response->setPrivate();
 
+// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
+$response->setStatusCode( 403, "Cannot continue." );
+return $response;
+
// --- Break the request into parts ---
$uri = $request->query->get( 'p', '' );
$parts = explode( '/', $uri );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I309f089c70e458ee222c66a9a0d6171fa98d9685
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: DEPLOYMENT ONLY: fix broken hack :(

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329381 )

Change subject: DEPLOYMENT ONLY: fix broken hack :(
..

DEPLOYMENT ONLY: fix broken hack :(

Change-Id: I309f089c70e458ee222c66a9a0d6171fa98d9685
---
M Core/Http/RequestHandler.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/81/329381/1

diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index f96efe2..7112439 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -23,15 +23,15 @@
// Can go away once we require PHP 5.6
ini_set( 'default_charset', 'UTF-8' );
 
-// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
-$response->setStatusCode( 403, "Cannot continue." );
-return $response;
-
// --- Get the request and response objects
$request = Request::createFromGlobals();
$response = new Response();
$response->setPrivate();
 
+// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
+$response->setStatusCode( 403, "Cannot continue." );
+return $response;
+
// --- Break the request into parts ---
$uri = $request->query->get( 'p', '' );
$parts = explode( '/', $uri );

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: DEPLOYMENT ONLY: Short-circuit everything to disable listene...

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329380 )

Change subject: DEPLOYMENT ONLY: Short-circuit everything to disable listeners, 
per T154209
..

DEPLOYMENT ONLY: Short-circuit everything to disable listeners, per T154209

Change-Id: I6dfb4682d4bad6b51ee41e799d8260fc501ca34a
---
M Core/Http/RequestHandler.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/80/329380/1

diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 5036a69..f96efe2 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -23,6 +23,10 @@
// Can go away once we require PHP 5.6
ini_set( 'default_charset', 'UTF-8' );
 
+// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
+$response->setStatusCode( 403, "Cannot continue." );
+return $response;
+
// --- Get the request and response objects
$request = Request::createFromGlobals();
$response = new Response();

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: DEPLOYMENT ONLY: Short-circuit everything to disable listene...

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329380 )

Change subject: DEPLOYMENT ONLY: Short-circuit everything to disable listeners, 
per T154209
..


DEPLOYMENT ONLY: Short-circuit everything to disable listeners, per T154209

Change-Id: I6dfb4682d4bad6b51ee41e799d8260fc501ca34a
---
M Core/Http/RequestHandler.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 5036a69..f96efe2 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -23,6 +23,10 @@
// Can go away once we require PHP 5.6
ini_set( 'default_charset', 'UTF-8' );
 
+// FIXME: Remove once https://phabricator.wikimedia.org/T154209 is resolved.
+$response->setStatusCode( 403, "Cannot continue." );
+return $response;
+
// --- Get the request and response objects
$request = Request::createFromGlobals();
$response = new Response();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6dfb4682d4bad6b51ee41e799d8260fc501ca34a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
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] wikimedia...SmashPig[deployment]: Update PHPMailer per T154209

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329378 )

Change subject: Update PHPMailer per T154209
..

Update PHPMailer per T154209

Change-Id: If029f267f7d07437e3f73a62ea4c4cc2d69a4c46
---
M composer.lock
M vendor
2 files changed, 12 insertions(+), 1,113 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/78/329378/1

diff --git a/composer.lock b/composer.lock
index 12315e9..b2d4e46 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "dff59f168d145674604d93452ae96038",
+"hash": "9f039a6ae0ef83a7dc971f0d731e24bd",
 "content-hash": "72818ec1b403ee3282de2647c26d1686",
 "packages": [
 {
@@ -44,7 +44,7 @@
 "payment",
 "payments"
 ],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17 00:44:20"
 },
 {
 "name": "clio/clio",
@@ -130,7 +130,8 @@
 },
 "scripts": {
 "test": [
-"parallel-lint . --exclude vendor"
+"parallel-lint . --exclude vendor",
+"phpunit"
 ]
 },
 "license": [
@@ -197,6 +198,7 @@
 "messaging",
 "stomp"
 ],
+"abandoned": "stomp-php/stomp-php",
 "time": "2013-02-23 17:34:44"
 },
 {
@@ -321,16 +323,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.16",
+"version": "v5.2.19",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
-"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
 "shasum": ""
 },
 "require": {
@@ -377,7 +379,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2016-06-06 09:09:37"
+"time": "2016-12-26 10:09:10"
 },
 {
 "name": "predis/predis",
@@ -805,1110 +807,7 @@
 "time": "2016-07-17 09:06:15"
 }
 ],
-"packages-dev": [
-{
-"name": "doctrine/instantiator",
-"version": "1.0.5",
-"source": {
-"type": "git",
-"url": "https://github.com/doctrine/instantiator.git;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3,<8.0-DEV"
-},
-"require-dev": {
-"athletic/athletic": "~0.1.8",
-"ext-pdo": "*",
-"ext-phar": "*",
-"phpunit/phpunit": "~4.0",
-"squizlabs/php_codesniffer": "~2.0"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Marco Pivetta",
-"email": "ocram...@gmail.com",
-"homepage": "http://ocramius.github.com/;
-}
-],
-"description": "A small, lightweight utility to instantiate 
objects in PHP without invoking their constructors",
-"homepage": "https://github.com/doctrine/instantiator;,
-"keywords": [
-

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHPMailer per T154209

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329377 )

Change subject: Update PHPMailer per T154209
..

Update PHPMailer per T154209

Change-Id: Ie4feec7ebbface65412e00bc8c826862ddebaf0c
---
M composer/LICENSE
M composer/autoload_real.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.scrutinizer.yml
D phpmailer/phpmailer/.travis.yml
D phpmailer/phpmailer/README.md
M phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
M phpmailer/phpmailer/class.phpmaileroauth.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
M phpmailer/phpmailer/examples/scripts/shLegacy.js
M phpmailer/phpmailer/examples/smtp_check.phps
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
R phpmailer/phpmailer/language/phpmailer.lang-cs.php
R phpmailer/phpmailer/language/phpmailer.lang-da.php
M phpmailer/phpmailer/language/phpmailer.lang-de.php
M phpmailer/phpmailer/language/phpmailer.lang-es.php
R phpmailer/phpmailer/language/phpmailer.lang-nb.php
R phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
M phpmailer/phpmailer/language/phpmailer.lang-ro.php
R phpmailer/phpmailer/language/phpmailer.lang-sv.php
D phpmailer/phpmailer/test/bootstrap.php
D phpmailer/phpmailer/test/fakepopserver.sh
D phpmailer/phpmailer/test/fakesendmail.sh
D phpmailer/phpmailer/test/phpmailerLangTest.php
D phpmailer/phpmailer/test/phpmailerTest.php
D phpmailer/phpmailer/test/runfakepopserver.sh
D phpmailer/phpmailer/test/test_callback.php
D phpmailer/phpmailer/test/testbootstrap-dist.php
D phpmailer/phpmailer/travis.phpunit.xml.dist
42 files changed, 612 insertions(+), 4,358 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig/vendor 
refs/changes/77/329377/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4feec7ebbface65412e00bc8c826862ddebaf0c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig/vendor
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] mediawiki...Refreshed[master]: Author list updates and sorting

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329056 )

Change subject: Author list updates and sorting
..


Author list updates and sorting

Change-Id: I5606d9b468645c5203cf3704a3ccb76a39252058
---
M skin.json
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/skin.json b/skin.json
index d278045..2647517 100644
--- a/skin.json
+++ b/skin.json
@@ -3,15 +3,15 @@
"version": "3.1.4",
"author": [
"Adam Carter",
-   "George Barnick",
-   "MtMNC",
-   "ShermanTheMythran",
-   "Jack Phoenix",
"Drew1200",
-   "SirComputer",
+   "George Barnick",
+   "Jack Phoenix",
+   "Lewis Cawte",
+   "MtMNC",
+   "Samantha Nguyen",
"Seaside98",
-   "Cody Nguyen",
-   "Lewis Cawte"
+   "ShermanTheMythran",
+   "SirComputer"
],
"url": "https://www.mediawiki.org/wiki/Skin:Refreshed;,
"descriptionmsg": "refreshed-desc",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5606d9b468645c5203cf3704a3ccb76a39252058
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Intorduce EditEntityApiChangeOpDeserializer interface

2016-12-27 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329376 )

Change subject: Intorduce EditEntityApiChangeOpDeserializer interface
..

Intorduce EditEntityApiChangeOpDeserializer interface

Bug: T153950
Change-Id: Ia6f8e6848a65f640085fbb5e20fb41ff74fcd146
---
A repo/includes/ChangeOp/EditEntityApiChangeOpDeserializer.php
1 file changed, 24 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/ChangeOp/EditEntityApiChangeOpDeserializer.php 
b/repo/includes/ChangeOp/EditEntityApiChangeOpDeserializer.php
new file mode 100644
index 000..6a967e7
--- /dev/null
+++ b/repo/includes/ChangeOp/EditEntityApiChangeOpDeserializer.php
@@ -0,0 +1,24 @@
+
+ */
+interface EditEntityApiChangeOpDeserializer {
+
+/**
+* @param array $data an array of data to apply. For example:
+*[ 'label' => [ 'zh' => [ 'remove' ], 'de' => [ 'value' => 
'Foo' ] ] ]
+* @param ChangeOps $changeOps ChangeOps to apploy
+* @param EntityDocument $entity entity to run validations. For example 
if it
+*implements LabelsProvider when applying labels.
+ * @return ChangeOps
+ */
+public function deserialize( array $data, ChangeOps $changeOps, 
EntityDocument $entity );
+
+}
+

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update PHPMailer: Leap into unknown

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329375 )

Change subject: Update PHPMailer: Leap into unknown
..

Update PHPMailer: Leap into unknown

There are many PHP >= 5.5 features being used now, and we've been overriding
PHP 5.3 lint on this repo for a few months, so that's no help.

Deploy and see what heats up.

Bug: T154209
Change-Id: I93a152ffb0a61c52c249d779ec959814d5cc16d4
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/75/329375/1

diff --git a/vendor b/vendor
index b75fc62..c4dc0ee 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19
+Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93a152ffb0a61c52c249d779ec959814d5cc16d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update PHPMailer: Leap into unknown

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329375 )

Change subject: Update PHPMailer: Leap into unknown
..


Update PHPMailer: Leap into unknown

There are many PHP >= 5.5 features being used now, and we've been overriding
PHP 5.3 lint on this repo for a few months, so that's no help.

Deploy and see what heats up.

Bug: T154209
Change-Id: I93a152ffb0a61c52c249d779ec959814d5cc16d4
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index b75fc62..c4dc0ee 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19
+Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93a152ffb0a61c52c249d779ec959814d5cc16d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
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] mediawiki...Echo[master]: Support limited anon notifications

2016-12-27 Thread Cen.temp (Code Review)

Cen.temp has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329374 )

Change subject: Support limited anon notifications
..

Support limited anon notifications

This provides support for limited anon notifications.
This relies on the object cache to (temporarily) store
notifications data and on cookies to let Echo know whether
the user is worth being notified (added when editing).
The UI is kept parcimonious, with no UI at all if the user
has no cookie, and UI for notifications only if there are
unread notifications.
Notifications are limited to ten by type, there is no page
filtering, they are local only and can't be marked unread.
Initial support is provided for mentions (enabled by default)
and reverts (disabled by default).

Change-Id: If0797a4b77909569c2108d48a5e76f90ac3e15f8
---
M Hooks.php
M extension.json
M includes/DiscussionParser.php
A includes/NotifAnon.php
A includes/NotifTarget.php
M includes/NotifUser.php
M includes/Notifier.php
M includes/SeenTime.php
M includes/UserLocator.php
M includes/api/ApiEchoMarkRead.php
M includes/api/ApiEchoMarkSeen.php
M includes/api/ApiEchoNotifications.php
M includes/controller/NotificationController.php
A includes/mapper/AnonNotificationMapper.php
M includes/mapper/EventMapper.php
M includes/model/Event.php
M includes/model/Notification.php
M includes/special/NotificationPager.php
M includes/special/SpecialNotifications.php
M includes/special/SpecialNotificationsMarkRead.php
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsInboxWidget.js
M modules/ui/mw.echo.ui.ToggleReadCircleButtonWidget.js
24 files changed, 960 insertions(+), 285 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 8891532..0a8cf88 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -522,13 +522,15 @@
return true;
}
 
-   $title = $article->getTitle();
+   // if anon, the local user is a contributor and should be made 
aware of alerts and notices on this IP
+   MWEchoNotifTarget::newFromUser( $user )->setNotifiable();
 
// Try to do this after the HTTP response
DeferredUpdates::addCallableUpdate( function () use ( $revision 
) {
EchoDiscussionParser::generateEventsForRevision( 
$revision );
} );
 
+   $title = $article->getTitle();
// If the user is not an IP and this is not a null edit,
// test for them reaching a congratulatory threshold
$thresholds = [ 1, 10, 100, 1000, 1, 10, 100 ];
@@ -575,13 +577,18 @@
$undidRevision = Revision::newFromId( $undidRevId );
if ( $undidRevision && 
$undidRevision->getTitle()->equals( $title ) ) {
$victimId = $undidRevision->getUser();
-   if ( $victimId ) { // No notifications for 
anonymous users
+   $victimName = $undidRevision->getUserText( 
Revision::RAW );
+   if ( $victimId || $victimName ) {
+   if ( $victimId ) {
+   $victimName = [];
+   }
EchoEvent::create( [
'type' => 'reverted',
'title' => $title,
'extra' => [
'revid' => 
$revision->getId(),
'reverted-user-id' => 
$victimId,
+   'reverted-user-name' => 
$victimName,
'reverted-revision-id' 
=> $undidRevId,
'method' => 'undo',
'summary' => $summary,
@@ -794,7 +801,7 @@
 * @return bool true in all cases
 */
public static function beforePageDisplay( $out, $skin ) {
-   if ( $out->getUser()->isLoggedIn() && $skin->getSkinName() !== 
'minerva' ) {
+   if ( $skin->getSkinName() !== 'minerva' ) {
// Load the module for the Notifications flyout
$out->addModules( [ 'ext.echo.init' ] );
// Load the styles for the Notifications badge
@@ -819,7 +826,9 @@
public static function onPersonalUrls( &$personal_urls, &$title, $sk ) {
global $wgEchoNewMsgAlert, $wgEchoShowFooterNotice;
$user

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove unnecessary script.sh file

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329365 )

Change subject: Remove unnecessary script.sh file
..


Remove unnecessary script.sh file

Change-Id: I00b88ead0b6df2452abcce951be3de757aab55fc
---
D script.sh
M skin.json
2 files changed, 1 insertion(+), 35 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/script.sh b/script.sh
deleted file mode 100755
index 492b228..000
--- a/script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-# TODO: Clean this up and make sure it works. This is really dirty right now.
-
-set -x
-
-originalDirectory=$(pwd)
-
-function installMediaWiki {
-   cd ..
-
-   wget https://github.com/wikimedia/mediawiki-core/archive/$MW.tar.gz
-   tar -zxf $MW.tar.gz
-   mv mediawiki-core-$MW mediawiki
-
-   cd mediawiki
-   
-   mysql -e 'create database its_a_mw;'
-   php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname 
its_a_mw --dbpath $(pwd) --pass $DBPASS Refreshed admin
-}
-
-function installRefreshed {
-
-   composer require 'phpunit/phpunit=3.7.*' --prefer-source
-   composer require 'mediawiki/refreshed-skin=@dev' --prefer-source
-
-   echo 'require_once( "$IP/skins/Refreshed/Refreshed.php" );' >> 
LocalSettings.php
-   echo '$wgDefaultSkin = "refreshed";' >> LocalSettings.php
-
-   php maintenance/update.php --quick
-}
-
-installMediaWiki
-installRefreshed
diff --git a/skin.json b/skin.json
index 3fe8b8c..d278045 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Refreshed",
-   "version": "3.1.3",
+   "version": "3.1.4",
"author": [
"Adam Carter",
"George Barnick",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00b88ead0b6df2452abcce951be3de757aab55fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove brickimedia-specific file

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329364 )

Change subject: Remove brickimedia-specific file
..


Remove brickimedia-specific file

Change-Id: Ic620c9529b0fdba8006a5fa3c9ffacb61edb46b0
---
D refreshed/studs-tile-refreshed.png
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/refreshed/studs-tile-refreshed.png 
b/refreshed/studs-tile-refreshed.png
deleted file mode 100644
index 37bec23..000
--- a/refreshed/studs-tile-refreshed.png
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic620c9529b0fdba8006a5fa3c9ffacb61edb46b0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Long array syntax...

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329371 )

Change subject: Long array syntax...
..


Long array syntax...

Performed using:
find . -name "*.php" -exec php 
~/php-short-array-syntax-converter/revert.php -w "{}" \;

Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
---
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/get_oauth_token.php
3 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Katie Horn: Looks good to me, approved
  Awight: Verified



diff --git a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php 
b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
index 71c9bd3..8d169b2 100644
--- a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
+++ b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
@@ -51,10 +51,10 @@
 
 private function getProvider()
 {
-return new League\OAuth2\Client\Provider\Google([
+return new League\OAuth2\Client\Provider\Google(array(
 'clientId' => $this->oauthClientId,
 'clientSecret' => $this->oauthClientSecret
-]);
+));
 }
 
 private function getGrant()
@@ -66,7 +66,7 @@
 {
 $provider = $this->getProvider();
 $grant = $this->getGrant();
-return $provider->getAccessToken($grant, ['refresh_token' => 
$this->oauthRefreshToken]);
+return $provider->getAccessToken($grant, array('refresh_token' => 
$this->oauthRefreshToken));
 }
 
 public function getOauth64()
diff --git a/phpmailer/phpmailer/extras/htmlfilter.php 
b/phpmailer/phpmailer/extras/htmlfilter.php
index 7727487..e9ce434 100644
--- a/phpmailer/phpmailer/extras/htmlfilter.php
+++ b/phpmailer/phpmailer/extras/htmlfilter.php
@@ -772,7 +772,7 @@
 tln_defang($contentTemp);
 tln_unspace($contentTemp);
 
-$match   = Array('/\/\*.*\*\//',
+$match   = array('/\/\*.*\*\//',
 '/expression/i',
 '/behaviou*r/i',
 '/binding/i',
@@ -780,7 +780,7 @@
 '/javascript/i',
 '/script/i',
 '/position/i');
-$replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 
'idiocy', '');
+$replace = array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 
'idiocy', '');
 $contentNew = preg_replace($match, $replace, $contentTemp);
 if ($contentNew !== $contentTemp) {
 $content = $contentNew;
diff --git a/phpmailer/phpmailer/get_oauth_token.php 
b/phpmailer/phpmailer/get_oauth_token.php
index 2c26d0f..b95d5c4 100644
--- a/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/phpmailer/get_oauth_token.php
@@ -80,24 +80,24 @@
 
 $params = array_merge(
 parent::getAuthorizationParameters($options),
-array_filter([
+array_filter(array(
 'hd'  => $this->hostedDomain,
 'access_type' => $this->accessType,
'scope'   => $this->scope,
 // if the user is logged in with more than one account ask 
which one to use for the login!
 'authuser'=> '-1'
-])
+))
 );
 return $params;
 }
 
 protected function getDefaultScopes()
 {
-return [
+return array(
 'email',
 'openid',
 'profile',
-];
+);
 }
 
 protected function getScopeSeparator()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Making licensing consistent throughout repo

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329060 )

Change subject: Making licensing consistent throughout repo
..


Making licensing consistent throughout repo

Also making tabbing consistent through composer.json, along with
updating a few links.

Bug: T136563
Change-Id: I807a36091097b037c49a3dd555a4a6ee7c04cf1d
---
M LICENSE
M composer.json
2 files changed, 334 insertions(+), 160 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/LICENSE b/LICENSE
index 65c5ca8..eef7bbd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,165 +1,339 @@
-   GNU LESSER GENERAL PUBLIC LICENSE
-   Version 3, 29 June 2007
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc., 
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
 
+Preamble
 
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-  0. Additional Definitions.
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
+Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this,

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHPMailer per T154209

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329370 )

Change subject: Update PHPMailer per T154209
..


Update PHPMailer per T154209

Change-Id: Iadde3b75ef3dfe05d7c1cffe2b258567c5bd724d
---
M composer/LICENSE
M composer/autoload_classmap.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.travis.yml
M phpmailer/phpmailer/LICENSE
A phpmailer/phpmailer/PHPMailerAutoload.php
D phpmailer/phpmailer/README.md
A phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
A phpmailer/phpmailer/class.phpmaileroauth.php
A phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.json
A phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
D phpmailer/phpmailer/docs/use_gmail.txt
A phpmailer/phpmailer/examples/DKIM.phps
A phpmailer/phpmailer/examples/code_generator.phps
M phpmailer/phpmailer/examples/contents.html
A phpmailer/phpmailer/examples/contentsutf8.html
A phpmailer/phpmailer/examples/exceptions.phps
A phpmailer/phpmailer/examples/gmail.phps
A phpmailer/phpmailer/examples/gmail_xoauth.phps
D phpmailer/phpmailer/examples/images/phpmailer.gif
A phpmailer/phpmailer/examples/images/phpmailer.png
D phpmailer/phpmailer/examples/images/phpmailer_mini.gif
A phpmailer/phpmailer/examples/images/phpmailer_mini.png
M phpmailer/phpmailer/examples/index.html
A phpmailer/phpmailer/examples/mail.phps
A phpmailer/phpmailer/examples/mailing_list.phps
A phpmailer/phpmailer/examples/pop_before_smtp.phps
A phpmailer/phpmailer/examples/scripts/XRegExp.js
A phpmailer/phpmailer/examples/scripts/shAutoloader.js
A phpmailer/phpmailer/examples/scripts/shBrushPhp.js
A phpmailer/phpmailer/examples/scripts/shCore.js
R phpmailer/phpmailer/examples/scripts/shLegacy.js
A phpmailer/phpmailer/examples/send_file_upload.phps
A phpmailer/phpmailer/examples/send_multiple_file_upload.phps
A phpmailer/phpmailer/examples/sendmail.phps
A phpmailer/phpmailer/examples/signed-mail.phps
A phpmailer/phpmailer/examples/smtp.phps
A phpmailer/phpmailer/examples/smtp_check.phps
A phpmailer/phpmailer/examples/smtp_no_auth.phps
A phpmailer/phpmailer/examples/ssl_options.phps
A phpmailer/phpmailer/examples/styles/shCore.css
A phpmailer/phpmailer/examples/styles/shCoreDefault.css
A phpmailer/phpmailer/examples/styles/shCoreDjango.css
A phpmailer/phpmailer/examples/styles/shCoreEclipse.css
A phpmailer/phpmailer/examples/styles/shCoreEmacs.css
A phpmailer/phpmailer/examples/styles/shCoreFadeToGrey.css
A phpmailer/phpmailer/examples/styles/shCoreMDUltra.css
A phpmailer/phpmailer/examples/styles/shCoreMidnight.css
A phpmailer/phpmailer/examples/styles/shCoreRDark.css
A phpmailer/phpmailer/examples/styles/shThemeAppleScript.css
A phpmailer/phpmailer/examples/styles/shThemeDefault.css
A phpmailer/phpmailer/examples/styles/shThemeDjango.css
A phpmailer/phpmailer/examples/styles/shThemeEclipse.css
A phpmailer/phpmailer/examples/styles/shThemeEmacs.css
A phpmailer/phpmailer/examples/styles/shThemeFadeToGrey.css
A phpmailer/phpmailer/examples/styles/shThemeMDUltra.css
A phpmailer/phpmailer/examples/styles/shThemeMidnight.css
A phpmailer/phpmailer/examples/styles/shThemeRDark.css
A phpmailer/phpmailer/examples/styles/shThemeVisualStudio.css
R phpmailer/phpmailer/examples/styles/wrapping.png
D phpmailer/phpmailer/examples/test_db_smtp_basic.php
D phpmailer/phpmailer/examples/test_mail_advanced.php
D phpmailer/phpmailer/examples/test_mail_basic.php
D phpmailer/phpmailer/examples/test_pop_before_smtp_advanced.php
D phpmailer/phpmailer/examples/test_pop_before_smtp_basic.php
D phpmailer/phpmailer/examples/test_sendmail_advanced.php
D phpmailer/phpmailer/examples/test_sendmail_basic.php
D phpmailer/phpmailer/examples/test_smtp_advanced.php
D phpmailer/phpmailer/examples/test_smtp_advanced_no_auth.php
D phpmailer/phpmailer/examples/test_smtp_basic.php
D phpmailer/phpmailer/examples/test_smtp_basic_no_auth.php
D phpmailer/phpmailer/examples/test_smtp_gmail_advanced.php
D phpmailer/phpmailer/examples/test_smtp_gmail_basic.php
A phpmailer/phpmailer/extras/EasyPeasyICS.php
A phpmailer/phpmailer/extras/README.md
D phpmailer/phpmailer/extras/class.html2text.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
A phpmailer/phpmailer/get_oauth_token.php
A phpmailer/phpmailer/language/phpmailer.lang-am.php
M phpmailer/phpmailer/language/phpmailer.lang-ar.php
A phpmailer/phpmailer/language/phpmailer.lang-az.php
A phpmailer/phpmailer/language/phpmailer.lang-be.php
A

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Revert "PHP5 glitches"

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329373 )

Change subject: Revert "PHP5 glitches"
..

Revert "PHP5 glitches"

This reverts commit 9f429ef9421abada3d10db86af33942a18ed1689.

Change-Id: Idd3294d23b960cadeef3a6da1492afea8fbd934c
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/73/329373/1

diff --git a/vendor b/vendor
index c4dc0ee..b75fc62 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa
+Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd3294d23b960cadeef3a6da1492afea8fbd934c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Revert "PHP5 glitches"

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329373 )

Change subject: Revert "PHP5 glitches"
..


Revert "PHP5 glitches"

This reverts commit 9f429ef9421abada3d10db86af33942a18ed1689.

Change-Id: Idd3294d23b960cadeef3a6da1492afea8fbd934c
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index c4dc0ee..b75fc62 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa
+Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3294d23b960cadeef3a6da1492afea8fbd934c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
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] wikimedia...crm[deployment]: PHP5 glitches

2016-12-27 Thread Awight (Code Review)

Awight has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329372 )

Change subject: PHP5 glitches
..


PHP5 glitches

Change-Id: I4d4616120cea5c64c39e6c473c97398a2686a175
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/vendor b/vendor
index b75fc62..c4dc0ee 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19
+Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d4616120cea5c64c39e6c473c97398a2686a175
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
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] wikimedia...crm[deployment]: PHP5 glitches

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329372 )

Change subject: PHP5 glitches
..

PHP5 glitches

Change-Id: I4d4616120cea5c64c39e6c473c97398a2686a175
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/72/329372/1

diff --git a/vendor b/vendor
index b75fc62..c4dc0ee 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19
+Subproject commit c4dc0eedce0c888a7d1632aa91b30d2b5722b0fa

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d4616120cea5c64c39e6c473c97398a2686a175
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Long array syntax...

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329371 )

Change subject: Long array syntax...
..

Long array syntax...

Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
---
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/get_oauth_token.php
3 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/71/329371/1

diff --git a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php 
b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
index 71c9bd3..8d169b2 100644
--- a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
+++ b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
@@ -51,10 +51,10 @@
 
 private function getProvider()
 {
-return new League\OAuth2\Client\Provider\Google([
+return new League\OAuth2\Client\Provider\Google(array(
 'clientId' => $this->oauthClientId,
 'clientSecret' => $this->oauthClientSecret
-]);
+));
 }
 
 private function getGrant()
@@ -66,7 +66,7 @@
 {
 $provider = $this->getProvider();
 $grant = $this->getGrant();
-return $provider->getAccessToken($grant, ['refresh_token' => 
$this->oauthRefreshToken]);
+return $provider->getAccessToken($grant, array('refresh_token' => 
$this->oauthRefreshToken));
 }
 
 public function getOauth64()
diff --git a/phpmailer/phpmailer/extras/htmlfilter.php 
b/phpmailer/phpmailer/extras/htmlfilter.php
index 7727487..e9ce434 100644
--- a/phpmailer/phpmailer/extras/htmlfilter.php
+++ b/phpmailer/phpmailer/extras/htmlfilter.php
@@ -772,7 +772,7 @@
 tln_defang($contentTemp);
 tln_unspace($contentTemp);
 
-$match   = Array('/\/\*.*\*\//',
+$match   = array('/\/\*.*\*\//',
 '/expression/i',
 '/behaviou*r/i',
 '/binding/i',
@@ -780,7 +780,7 @@
 '/javascript/i',
 '/script/i',
 '/position/i');
-$replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 
'idiocy', '');
+$replace = array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 
'idiocy', '');
 $contentNew = preg_replace($match, $replace, $contentTemp);
 if ($contentNew !== $contentTemp) {
 $content = $contentNew;
diff --git a/phpmailer/phpmailer/get_oauth_token.php 
b/phpmailer/phpmailer/get_oauth_token.php
index 2c26d0f..b95d5c4 100644
--- a/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/phpmailer/get_oauth_token.php
@@ -80,24 +80,24 @@
 
 $params = array_merge(
 parent::getAuthorizationParameters($options),
-array_filter([
+array_filter(array(
 'hd'  => $this->hostedDomain,
 'access_type' => $this->accessType,
'scope'   => $this->scope,
 // if the user is logged in with more than one account ask 
which one to use for the login!
 'authuser'=> '-1'
-])
+))
 );
 return $params;
 }
 
 protected function getDefaultScopes()
 {
-return [
+return array(
 'email',
 'openid',
 'profile',
-];
+);
 }
 
 protected function getScopeSeparator()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
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] wikimedia...crm[deployment]: Update PHPMailer per T154209

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329369 )

Change subject: Update PHPMailer per T154209
..


Update PHPMailer per T154209

Change-Id: Ia2171b00c47490e746f58442f76ef23ec8d02c4d
---
M composer.json
M composer.lock
M vendor
3 files changed, 19 insertions(+), 12 deletions(-)

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



diff --git a/composer.json b/composer.json
index e16b453..fa55f4f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.19",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index 6a1c355..30ab830 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": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "cec6275ac424c446d05c52716f6274f5",
+"content-hash": "91931727db11a0b3a078b4c4401f5b5f",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.19",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
 "shasum": ""
 },
 "require": {
@@ -466,14 +466,21 @@
 },
 "require-dev": {
 "phpdocumentor/phpdocumentor": "*",
-"phpunit/phpunit": "*"
+"phpunit/phpunit": "4.7.*"
+},
+"suggest": {
+"league/oauth2-google": "Needed for Google XOAUTH2 
authentication"
 },
 "type": "library",
 "autoload": {
 "classmap": [
 "class.phpmailer.php",
+"class.phpmaileroauth.php",
+"class.phpmaileroauthgoogle.php",
+"class.smtp.php",
 "class.pop3.php",
-"class.smtp.php"
+"extras/EasyPeasyICS.php",
+"extras/ntlm_sasl_client.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -498,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2013-04-11 16:45:39"
+"time": "2016-12-26 10:09:10"
 },
 {
 "name": "phpseclib/phpseclib",
@@ -1191,7 +1198,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-12-06 19:40:49"
+"time": "2016-12-06 19:11:55"
 },
 {
 "name": "zordius/lightncandy",
diff --git a/vendor b/vendor
index b861ec0..b75fc62 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b861ec091301115a10c0efb5969b869f861e6ef7
+Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2171b00c47490e746f58442f76ef23ec8d02c4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added remote autocompletion within Special:Drilldown

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329367 )

Change subject: Added remote autocompletion within Special:Drilldown
..


Added remote autocompletion within Special:Drilldown

Change-Id: Ia6fef46f6c4a859fa296573569dcb39768b04b2a
---
A api/CargoAutocompleteAPI.php
M drilldown/CargoSpecialDrilldown.php
M drilldown/resources/CargoDrilldown.js
3 files changed, 205 insertions(+), 17 deletions(-)

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



diff --git a/api/CargoAutocompleteAPI.php b/api/CargoAutocompleteAPI.php
new file mode 100644
index 000..5e11a19
--- /dev/null
+++ b/api/CargoAutocompleteAPI.php
@@ -0,0 +1,139 @@
+extractRequestParams();
+   $substr = $params['substr'];
+   $table = $params['table'];
+   $field = $params['field'];
+   $field_is_array = $params['field_is_array'];
+   $where = $params['where'];
+
+   $data = self::getAllValues( $table, $field, $field_is_array, 
$where, $substr );
+
+   // If we got back an error message, exit with that message.
+   if ( !is_array( $data ) ) {
+   if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+   if ( !$data instanceof Message ) {
+   $data = ApiMessage::create( new 
RawMessage( '$1', [ $data ] ), 'unknownerror' );
+   }
+   $this->dieWithError( $data );
+   } else {
+   $code = 'unknownerror';
+   if ( $data instanceof Message ) {
+   $code = $data instanceof IApiMessage ? 
$data->getApiCode() : $data->getKey();
+   $data = $data->inLanguage( 'en' 
)->useDatabase( false )->text();
+   }
+   $this->dieUsage( $data, $code );
+   }
+   }
+
+   // Set top-level elements.
+   $result = $this->getResult();
+   $result->setIndexedTagName( $data, 'p' );
+   $result->addValue( null, $this->getModuleName(), $data );
+   }
+
+   protected function getAllowedParams() {
+   return array (
+   'limit' => array (
+   ApiBase::PARAM_TYPE => 'limit',
+   ApiBase::PARAM_DFLT => 10,
+   ApiBase::PARAM_MIN => 1,
+   ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
+   ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
+   ),
+   'substr' => null,
+   'table' => null,
+   'field' => null,
+   'field_is_array' => false,
+   'where' => null,
+   );
+   }
+
+   protected function getParamDescription() {
+   return array(
+   'substr' => 'Search substring',
+   'table' => 'Cargo table for which to search values',
+   'field' => 'Cargo field for which to search values',
+   'field_is_array' => 'Whether the field holds an 
array/list of values',
+   'where' => 'The "where" clause for the query, based on 
the other filters specified',
+   );
+   }
+
+   protected function getDescription() {
+   return 'Autocompletion call used by Special:Drilldown, defined 
by the Cargo extension (https://www.mediawiki.org/Extension:Cargo)';
+   }
+
+   protected function getExamples() {
+   return array(
+   
'api.php?action=cargoautocomplete=Books=Author=jo',
+   
'api.php?action=cargoautocomplete=Books=Author=Genre=comedy+AND+Year_published=1986=jo',
+   );
+   }
+
+   public function getVersion() {
+   return __CLASS__ . ': $Id$';
+   }
+
+   private static function getAllValues( $table, $field, $fieldIsArray, 
$where, $substr ) {
+   $values = array();
+
+   if ( !is_null( $substr ) ) {
+   if ( $where != '' ) {
+   $where .= " AND ";
+   }
+   $operator = ( $fieldIsArray ) ? "HOLDS LIKE" : "LIKE";
+   // There's no such global variable at the moment -
+   // perhaps there will be in the future.
+   //if ( $wgCargoDrilldownAutocompleteOnAllChars ) {
+   //  $where .= "($field $operator \"%$substr%\")";
+   //} else {
+   $where .= "($field

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update PHPMailer per T154209

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329370 )

Change subject: Update PHPMailer per T154209
..

Update PHPMailer per T154209

Change-Id: Iadde3b75ef3dfe05d7c1cffe2b258567c5bd724d
---
M composer/LICENSE
M composer/autoload_classmap.php
M composer/installed.json
D phpmailer/phpmailer/.gitignore
D phpmailer/phpmailer/.travis.yml
M phpmailer/phpmailer/LICENSE
A phpmailer/phpmailer/PHPMailerAutoload.php
D phpmailer/phpmailer/README.md
A phpmailer/phpmailer/VERSION
D phpmailer/phpmailer/changelog.md
M phpmailer/phpmailer/class.phpmailer.php
A phpmailer/phpmailer/class.phpmaileroauth.php
A phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/class.pop3.php
M phpmailer/phpmailer/class.smtp.php
M phpmailer/phpmailer/composer.json
A phpmailer/phpmailer/composer.lock
D phpmailer/phpmailer/docs/Callback_function_notes.txt
D phpmailer/phpmailer/docs/DomainKeys_notes.txt
D phpmailer/phpmailer/docs/Note_for_SMTP_debugging.txt
D phpmailer/phpmailer/docs/extending.html
D phpmailer/phpmailer/docs/faq.html
D phpmailer/phpmailer/docs/generatedocs.sh
D phpmailer/phpmailer/docs/pop3_article.txt
D phpmailer/phpmailer/docs/use_gmail.txt
A phpmailer/phpmailer/examples/DKIM.phps
A phpmailer/phpmailer/examples/code_generator.phps
M phpmailer/phpmailer/examples/contents.html
A phpmailer/phpmailer/examples/contentsutf8.html
A phpmailer/phpmailer/examples/exceptions.phps
A phpmailer/phpmailer/examples/gmail.phps
A phpmailer/phpmailer/examples/gmail_xoauth.phps
D phpmailer/phpmailer/examples/images/phpmailer.gif
A phpmailer/phpmailer/examples/images/phpmailer.png
D phpmailer/phpmailer/examples/images/phpmailer_mini.gif
A phpmailer/phpmailer/examples/images/phpmailer_mini.png
M phpmailer/phpmailer/examples/index.html
A phpmailer/phpmailer/examples/mail.phps
A phpmailer/phpmailer/examples/mailing_list.phps
A phpmailer/phpmailer/examples/pop_before_smtp.phps
A phpmailer/phpmailer/examples/scripts/XRegExp.js
A phpmailer/phpmailer/examples/scripts/shAutoloader.js
A phpmailer/phpmailer/examples/scripts/shBrushPhp.js
A phpmailer/phpmailer/examples/scripts/shCore.js
R phpmailer/phpmailer/examples/scripts/shLegacy.js
A phpmailer/phpmailer/examples/send_file_upload.phps
A phpmailer/phpmailer/examples/send_multiple_file_upload.phps
A phpmailer/phpmailer/examples/sendmail.phps
A phpmailer/phpmailer/examples/signed-mail.phps
A phpmailer/phpmailer/examples/smtp.phps
A phpmailer/phpmailer/examples/smtp_check.phps
A phpmailer/phpmailer/examples/smtp_no_auth.phps
A phpmailer/phpmailer/examples/ssl_options.phps
A phpmailer/phpmailer/examples/styles/shCore.css
A phpmailer/phpmailer/examples/styles/shCoreDefault.css
A phpmailer/phpmailer/examples/styles/shCoreDjango.css
A phpmailer/phpmailer/examples/styles/shCoreEclipse.css
A phpmailer/phpmailer/examples/styles/shCoreEmacs.css
A phpmailer/phpmailer/examples/styles/shCoreFadeToGrey.css
A phpmailer/phpmailer/examples/styles/shCoreMDUltra.css
A phpmailer/phpmailer/examples/styles/shCoreMidnight.css
A phpmailer/phpmailer/examples/styles/shCoreRDark.css
A phpmailer/phpmailer/examples/styles/shThemeAppleScript.css
A phpmailer/phpmailer/examples/styles/shThemeDefault.css
A phpmailer/phpmailer/examples/styles/shThemeDjango.css
A phpmailer/phpmailer/examples/styles/shThemeEclipse.css
A phpmailer/phpmailer/examples/styles/shThemeEmacs.css
A phpmailer/phpmailer/examples/styles/shThemeFadeToGrey.css
A phpmailer/phpmailer/examples/styles/shThemeMDUltra.css
A phpmailer/phpmailer/examples/styles/shThemeMidnight.css
A phpmailer/phpmailer/examples/styles/shThemeRDark.css
A phpmailer/phpmailer/examples/styles/shThemeVisualStudio.css
R phpmailer/phpmailer/examples/styles/wrapping.png
D phpmailer/phpmailer/examples/test_db_smtp_basic.php
D phpmailer/phpmailer/examples/test_mail_advanced.php
D phpmailer/phpmailer/examples/test_mail_basic.php
D phpmailer/phpmailer/examples/test_pop_before_smtp_advanced.php
D phpmailer/phpmailer/examples/test_pop_before_smtp_basic.php
D phpmailer/phpmailer/examples/test_sendmail_advanced.php
D phpmailer/phpmailer/examples/test_sendmail_basic.php
D phpmailer/phpmailer/examples/test_smtp_advanced.php
D phpmailer/phpmailer/examples/test_smtp_advanced_no_auth.php
D phpmailer/phpmailer/examples/test_smtp_basic.php
D phpmailer/phpmailer/examples/test_smtp_basic_no_auth.php
D phpmailer/phpmailer/examples/test_smtp_gmail_advanced.php
D phpmailer/phpmailer/examples/test_smtp_gmail_basic.php
A phpmailer/phpmailer/extras/EasyPeasyICS.php
A phpmailer/phpmailer/extras/README.md
D phpmailer/phpmailer/extras/class.html2text.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/extras/ntlm_sasl_client.php
A phpmailer/phpmailer/get_oauth_token.php
A phpmailer/phpmailer/language/phpmailer.lang-am.php
M phpmailer/phpmailer/language/phpmailer.lang-ar.php
A phpmailer/phpmailer/language/phpmailer.lang-az.php
A phpmailer/phpmailer/language/phpmailer.lang-be.php
A

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Update PHPMailer per T154209

2016-12-27 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329369 )

Change subject: Update PHPMailer per T154209
..

Update PHPMailer per T154209

Change-Id: Ia2171b00c47490e746f58442f76ef23ec8d02c4d
---
M composer.json
M composer.lock
M vendor
3 files changed, 19 insertions(+), 12 deletions(-)


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

diff --git a/composer.json b/composer.json
index e16b453..fa55f4f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 "cogpowered/finediff": "0.*",
 "wikimedia/donation-interface": "dev-master",
 "wikimedia/smash-pig": "dev-master",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.19",
 "phpseclib/phpseclib": "0.3.7",
 "predis/predis": "1.*",
 "twig/twig": "1.*"
diff --git a/composer.lock b/composer.lock
index 6a1c355..30ab830 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": "9d1888ed603a23fbd5afb2b4eb99acdb",
-"content-hash": "d3d501379291d40d65774ef35b503768",
+"hash": "cec6275ac424c446d05c52716f6274f5",
+"content-hash": "91931727db11a0b3a078b4c4401f5b5f",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -449,16 +449,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.19",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9;,
+"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
 "shasum": ""
 },
 "require": {
@@ -466,14 +466,21 @@
 },
 "require-dev": {
 "phpdocumentor/phpdocumentor": "*",
-"phpunit/phpunit": "*"
+"phpunit/phpunit": "4.7.*"
+},
+"suggest": {
+"league/oauth2-google": "Needed for Google XOAUTH2 
authentication"
 },
 "type": "library",
 "autoload": {
 "classmap": [
 "class.phpmailer.php",
+"class.phpmaileroauth.php",
+"class.phpmaileroauthgoogle.php",
+"class.smtp.php",
 "class.pop3.php",
-"class.smtp.php"
+"extras/EasyPeasyICS.php",
+"extras/ntlm_sasl_client.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -498,7 +505,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2013-04-11 16:45:39"
+"time": "2016-12-26 10:09:10"
 },
 {
 "name": "phpseclib/phpseclib",
@@ -1191,7 +1198,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-12-06 19:40:49"
+"time": "2016-12-06 19:11:55"
 },
 {
 "name": "zordius/lightncandy",
diff --git a/vendor b/vendor
index b861ec0..b75fc62 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit b861ec091301115a10c0efb5969b869f861e6ef7
+Subproject commit b75fc62397f78d3efd35b2feed7f363d9158dc19

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2171b00c47490e746f58442f76ef23ec8d02c4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added remote autocompletion within Special:Drilldown

2016-12-27 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329367 )

Change subject: Added remote autocompletion within Special:Drilldown
..

Added remote autocompletion within Special:Drilldown

Change-Id: Ia6fef46f6c4a859fa296573569dcb39768b04b2a
---
A api/CargoAutocompleteAPI.php
M drilldown/CargoSpecialDrilldown.php
M drilldown/resources/CargoDrilldown.js
3 files changed, 205 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/67/329367/2

diff --git a/api/CargoAutocompleteAPI.php b/api/CargoAutocompleteAPI.php
new file mode 100644
index 000..5e11a19
--- /dev/null
+++ b/api/CargoAutocompleteAPI.php
@@ -0,0 +1,139 @@
+extractRequestParams();
+   $substr = $params['substr'];
+   $table = $params['table'];
+   $field = $params['field'];
+   $field_is_array = $params['field_is_array'];
+   $where = $params['where'];
+
+   $data = self::getAllValues( $table, $field, $field_is_array, 
$where, $substr );
+
+   // If we got back an error message, exit with that message.
+   if ( !is_array( $data ) ) {
+   if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+   if ( !$data instanceof Message ) {
+   $data = ApiMessage::create( new 
RawMessage( '$1', [ $data ] ), 'unknownerror' );
+   }
+   $this->dieWithError( $data );
+   } else {
+   $code = 'unknownerror';
+   if ( $data instanceof Message ) {
+   $code = $data instanceof IApiMessage ? 
$data->getApiCode() : $data->getKey();
+   $data = $data->inLanguage( 'en' 
)->useDatabase( false )->text();
+   }
+   $this->dieUsage( $data, $code );
+   }
+   }
+
+   // Set top-level elements.
+   $result = $this->getResult();
+   $result->setIndexedTagName( $data, 'p' );
+   $result->addValue( null, $this->getModuleName(), $data );
+   }
+
+   protected function getAllowedParams() {
+   return array (
+   'limit' => array (
+   ApiBase::PARAM_TYPE => 'limit',
+   ApiBase::PARAM_DFLT => 10,
+   ApiBase::PARAM_MIN => 1,
+   ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
+   ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
+   ),
+   'substr' => null,
+   'table' => null,
+   'field' => null,
+   'field_is_array' => false,
+   'where' => null,
+   );
+   }
+
+   protected function getParamDescription() {
+   return array(
+   'substr' => 'Search substring',
+   'table' => 'Cargo table for which to search values',
+   'field' => 'Cargo field for which to search values',
+   'field_is_array' => 'Whether the field holds an 
array/list of values',
+   'where' => 'The "where" clause for the query, based on 
the other filters specified',
+   );
+   }
+
+   protected function getDescription() {
+   return 'Autocompletion call used by Special:Drilldown, defined 
by the Cargo extension (https://www.mediawiki.org/Extension:Cargo)';
+   }
+
+   protected function getExamples() {
+   return array(
+   
'api.php?action=cargoautocomplete=Books=Author=jo',
+   
'api.php?action=cargoautocomplete=Books=Author=Genre=comedy+AND+Year_published=1986=jo',
+   );
+   }
+
+   public function getVersion() {
+   return __CLASS__ . ': $Id$';
+   }
+
+   private static function getAllValues( $table, $field, $fieldIsArray, 
$where, $substr ) {
+   $values = array();
+
+   if ( !is_null( $substr ) ) {
+   if ( $where != '' ) {
+   $where .= " AND ";
+   }
+   $operator = ( $fieldIsArray ) ? "HOLDS LIKE" : "LIKE";
+   // There's no such global variable at the moment -
+   // perhaps there will be in the future.
+   //if ( $wgCargoDrilldownAutocompleteOnAllChars ) {
+   //  $where .= "($field $operator \"%$substr%\")";
+   //} else {
+   $where .=

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Fix default value in Special:NewLexeme

2016-12-27 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329368 )

Change subject: Fix default value in Special:NewLexeme
..

Fix default value in Special:NewLexeme

Change-Id: I9279a075366e214715d5cdb953bd45c9846f05f5
---
M src/Specials/SpecialNewLexeme.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/src/Specials/SpecialNewLexeme.php 
b/src/Specials/SpecialNewLexeme.php
index a3f14d1..f134bcb 100644
--- a/src/Specials/SpecialNewLexeme.php
+++ b/src/Specials/SpecialNewLexeme.php
@@ -176,13 +176,13 @@
 
$lexicalCategory = $this->getRequest()->getVal(
'lexicalcategory',
-   isset( $this->parts[0] ) ? $this->parts[0] : ''
+   isset( $this->parts[1] ) ? $this->parts[1] : ''
);
$this->lexicalCategory = $this->stringNormalizer->trimToNFC( 
$lexicalCategory );
 
$language = $this->getRequest()->getVal(
'language',
-   isset( $this->parts[0] ) ? $this->parts[0] : ''
+   isset( $this->parts[2] ) ? $this->parts[2] : ''
);
$this->language = $this->stringNormalizer->trimToNFC( $language 
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9279a075366e214715d5cdb953bd45c9846f05f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix an E_NOTICE and an E_WARNING that were showing up on a b...

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329308 )

Change subject: Fix an E_NOTICE and an E_WARNING that were showing up on a 
brand new wiki w/o any categories
..


Fix an E_NOTICE and an E_WARNING that were showing up on a brand new wiki w/o 
any categories

Change-Id: I20129912c4c40ff1c18b6df87cd29705b2e2d31b
---
M SpecialFanBoxes.php
M TagCloudClass.php
2 files changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  SamanthaNguyen: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/SpecialFanBoxes.php b/SpecialFanBoxes.php
index 4b329ef..8f3c9fc 100644
--- a/SpecialFanBoxes.php
+++ b/SpecialFanBoxes.php
@@ -404,18 +404,20 @@
$tagcloud = '';
$tagnumber = 0;
$tabcounter = 1;
-   foreach ( $cloud->tags as $tag => $att ) {
-   $tag = str_replace( 'Fans', '', $tag );
-   $tag = trim( $tag );
-   $slashedTag = $tag; // define variable
-   // Fix for categories that contain an apostrophe
-   if ( strpos( $tag, "'" ) ) {
-   $slashedTag = str_replace( "'", "\'", $tag );
-   }
-   $tagcloud .= " tags[$tag]['size']}{$cloud->tags_size_type}\">
+   if ( isset( $cloud->tags ) && $cloud->tags ) {
+   foreach ( $cloud->tags as $tag => $att ) {
+   $tag = str_replace( 'Fans', '', $tag );
+   $tag = trim( $tag );
+   $slashedTag = $tag; // define variable
+   // Fix for categories that contain an apostrophe
+   if ( strpos( $tag, "'" ) ) {
+   $slashedTag = str_replace( "'", "\'", 
$tag );
+   }
+   $tagcloud .= " tags[$tag]['size']}{$cloud->tags_size_type}\">
{$tag}
\n";
-   $tagnumber++;
+   $tagnumber++;
+   }
}
 
$tagcloud .= '';
diff --git a/TagCloudClass.php b/TagCloudClass.php
index e9a3cb2..dd7b8ee 100644
--- a/TagCloudClass.php
+++ b/TagCloudClass.php
@@ -8,6 +8,7 @@
public $tags_max_pts = 32;
public $tags_highest_count = 0;
public $tags_size_type = 'pt';
+   public $tags = array();
 
public function __construct( $limit = 10 ) {
$this->limit = $limit;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20129912c4c40ff1c18b6df87cd29705b2e2d31b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Update outdated libraries

2016-12-27 Thread Phantom42 (Code Review)

Phantom42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329366 )

Change subject: Update outdated libraries
..

Update outdated libraries

Change-Id: I39ff5685efb3a8baa527117aa2f1859e4cfdbc62
T: T146021
---
M package.json
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/66/329366/1

diff --git a/package.json b/package.json
index 335401b..6308cb3 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
 "test": "grunt test"
   },
   "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-banana-checker": "0.4.0",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-jsonlint": "1.0.7"
+"grunt": "1.0.1",
+"grunt-cli": "1.2.0",
+"grunt-banana-checker": "0.5.0",
+"grunt-contrib-jshint": "1.1.0",
+"grunt-jsonlint": "1.1.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39ff5685efb3a8baa527117aa2f1859e4cfdbc62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Making some minor changes like making license consistent, re...

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329364 )

Change subject: Making some minor changes like making license consistent, 
removing brickimedia-specific file, etc.
..

Making some minor changes like making license consistent, removing 
brickimedia-specific file, etc.

Change-Id: Ic620c9529b0fdba8006a5fa3c9ffacb61edb46b0
---
D refreshed/studs-tile-refreshed.png
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed 
refs/changes/64/329364/1

diff --git a/refreshed/studs-tile-refreshed.png 
b/refreshed/studs-tile-refreshed.png
deleted file mode 100644
index 37bec23..000
--- a/refreshed/studs-tile-refreshed.png
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic620c9529b0fdba8006a5fa3c9ffacb61edb46b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove unnecessary script.sh file

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329365 )

Change subject: Remove unnecessary script.sh file
..

Remove unnecessary script.sh file

Change-Id: I00b88ead0b6df2452abcce951be3de757aab55fc
---
D script.sh
M skin.json
2 files changed, 1 insertion(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed 
refs/changes/65/329365/1

diff --git a/script.sh b/script.sh
deleted file mode 100755
index 492b228..000
--- a/script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-# TODO: Clean this up and make sure it works. This is really dirty right now.
-
-set -x
-
-originalDirectory=$(pwd)
-
-function installMediaWiki {
-   cd ..
-
-   wget https://github.com/wikimedia/mediawiki-core/archive/$MW.tar.gz
-   tar -zxf $MW.tar.gz
-   mv mediawiki-core-$MW mediawiki
-
-   cd mediawiki
-   
-   mysql -e 'create database its_a_mw;'
-   php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname 
its_a_mw --dbpath $(pwd) --pass $DBPASS Refreshed admin
-}
-
-function installRefreshed {
-
-   composer require 'phpunit/phpunit=3.7.*' --prefer-source
-   composer require 'mediawiki/refreshed-skin=@dev' --prefer-source
-
-   echo 'require_once( "$IP/skins/Refreshed/Refreshed.php" );' >> 
LocalSettings.php
-   echo '$wgDefaultSkin = "refreshed";' >> LocalSettings.php
-
-   php maintenance/update.php --quick
-}
-
-installMediaWiki
-installRefreshed
diff --git a/skin.json b/skin.json
index 3bf1bdb..2647517 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Refreshed",
-   "version": "3.1.3",
+   "version": "3.1.4",
"author": [
"Adam Carter",
"Drew1200",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00b88ead0b6df2452abcce951be3de757aab55fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Dusk[master]: Get rid of support for >IE6 & >Opera7, bump v#

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329363 )

Change subject: Get rid of support for >IE6 & >Opera7, bump v#
..


Get rid of support for >IE6 & >Opera7, bump v#

Bug: T154199
Change-Id: Id0f7a7a67c001fb511bb6953ed3f574b12f0dc00
---
D resources/css/IE50Fixes.css
D resources/css/IE55Fixes.css
D resources/css/IE60Fixes.css
D resources/css/IEMacFixes.css
D resources/css/Opera6Fixes.css
D resources/css/Opera7Fixes.css
M skin.json
7 files changed, 1 insertion(+), 291 deletions(-)

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



diff --git a/resources/css/IE50Fixes.css b/resources/css/IE50Fixes.css
deleted file mode 100644
index 2e7829b..000
--- a/resources/css/IE50Fixes.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-** IE5.0 fix stylesheet
-*/
-
-#column-content {
-   margin: 0 !important;
-   float: none;
-}
-#column-content #content { 
-   margin-top: 3em; 
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   overflow: visible;
-   top: 0;
-   left: 0;
-   z-index: 3;
-}
-#footer {
-   margin: 0 0 0 13.6em;
-}
-
-/* IE 5 & 5.5 interpret keyword sizes one off */
-body { font-size: xx-small; }
-/*
-** the edit tabs
-*/
-#p-cactions li {
-   float: left;
-   padding-top: 0;
-   padding-bottom: 0 !important;
-   height: 0.9em;
-}
-#p-cactions li a {
-   display: block;
-   padding-bottom: 0.045em;
-}
-#p-cactions li.selected a {
-   padding-bottom: 0.17em;
-}
-#p-cactions li a:hover {
-   padding-bottom: 0.17em;
-}
-/* 5.0 doesn't like the background icon for external links and user */
-.link-external,
-.external {
-   background: none;
-   padding: 0;
-}
-#p-personal ul { float: right }
-#p-personal li { float: left }
-li#pt-userpage,
-li#pt-anonuserpage,
-li#pt-login,
-li#pt-logout {
-   background: none;
-   padding-left: none;
-}
-.visualClear {
-   width: 100%;
-   height: 0px;
-   padding: 0;
-   margin: 0;
-}
-.firstHeading { margin-bottom: 0.3em; }
\ No newline at end of file
diff --git a/resources/css/IE55Fixes.css b/resources/css/IE55Fixes.css
deleted file mode 100644
index f65fb65..000
--- a/resources/css/IE55Fixes.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* IE5.5/win- only fixes */
-
-#column-content {
-   float: none;
-   margin-left: 0;
-   height: 1%;
-}
-#column-content #content {
-   position: relative;
-   z-index: 5;
-   margin-left: 12.2em;
-   margin-top: 3em;
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   top: 0;
-   left: 0;
-   z-index: 4;
-   width: 100%;
-}
-#footer {
-   margin-left: 13.6em;
-   border-left: 1px solid #fabd23;
-}
-
-#p-personal { padding-bottom: 0.1em; }
-
-body { font-size: xx-small; }
-
-#p-cactions {
-   width: 76% !important;
-   z-index: 3 !important;
-   float: none;
-}
-#p-cactions li {
-   padding-bottom: 0 !important;
-   border: none;
-   background-color: transparent;
-   cursor: default;
-   float: none !important;
-}
-#p-cactions li a {
-   display: inline-block !important;
-   vertical-align: top;
-   padding-bottom: 0;
-   border: solid #aaa;
-   border-width: 1px 1px 0;
-}
-#p-cactions li.selected a {
-   border-color: #fabd23;
-   padding-bottom: 0.17em;
-}
-#p-cactions li a:hover {
-   padding-bottom: 0.17em;
-}
-.portlet {
-   overflow: hidden;
-}
-#bodyContent a.external {
-   background: url(../../../monobook/external-ltr.png) center right 
no-repeat;
-   padding-right: 13px;
-}
-/* show the hand */
-#p-logo a,
-#p-logo a:hover {
-   cursor: pointer;
-}
-.visualClear {
-   width: 90%;
-   height: 1px;
-   padding: 0;
-   margin: 0;
-}
-
-#editform {
-   width: 100%;
-}
\ No newline at end of file
diff --git a/resources/css/IE60Fixes.css b/resources/css/IE60Fixes.css
deleted file mode 100644
index d3a81c8..000
--- a/resources/css/IE60Fixes.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 6.0 - only fixes */
-/* content area */ 
-/* workaround for various IE float bugs */
-#column-content { 
-   float: none; 
-   margin-left: 0;
-   height: 1%;
-}
-#column-content #content {
-   margin-left: 12.2em;
-   margin-top: 3em;
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   top: 0;
-   left: 0;
-   z-index: 4;
-}
-#footer {
-   margin-left: 13.6em;
-   border-left: 1px solid #fabd23;
-}
-
-/* the tabs */
-#p-cactions {
-   z-index: 3;
-}
-
-#p-cactions li {
-   padding-bottom: 0 !important;
-   border: none;
-   background-color: transparent;
-   cursor: default;
-   float: none !important;
-}
-#p-cactions li a {
-   display: inline-block !important;
-   vertical-align: top;
-   padding-bottom: 0;
-   border: solid #aaa;
-

[MediaWiki-commits] [Gerrit] mediawiki...Dusk[master]: Get rid of support for >IE6 & >Opera7, bump v#

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329363 )

Change subject: Get rid of support for >IE6 & >Opera7, bump v#
..

Get rid of support for >IE6 & >Opera7, bump v#

Bug: T154199
Change-Id: Id0f7a7a67c001fb511bb6953ed3f574b12f0dc00
---
D resources/css/IE50Fixes.css
D resources/css/IE55Fixes.css
D resources/css/IE60Fixes.css
D resources/css/IEMacFixes.css
D resources/css/Opera6Fixes.css
D resources/css/Opera7Fixes.css
M skin.json
7 files changed, 1 insertion(+), 291 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Dusk 
refs/changes/63/329363/1

diff --git a/resources/css/IE50Fixes.css b/resources/css/IE50Fixes.css
deleted file mode 100644
index 2e7829b..000
--- a/resources/css/IE50Fixes.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-** IE5.0 fix stylesheet
-*/
-
-#column-content {
-   margin: 0 !important;
-   float: none;
-}
-#column-content #content { 
-   margin-top: 3em; 
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   overflow: visible;
-   top: 0;
-   left: 0;
-   z-index: 3;
-}
-#footer {
-   margin: 0 0 0 13.6em;
-}
-
-/* IE 5 & 5.5 interpret keyword sizes one off */
-body { font-size: xx-small; }
-/*
-** the edit tabs
-*/
-#p-cactions li {
-   float: left;
-   padding-top: 0;
-   padding-bottom: 0 !important;
-   height: 0.9em;
-}
-#p-cactions li a {
-   display: block;
-   padding-bottom: 0.045em;
-}
-#p-cactions li.selected a {
-   padding-bottom: 0.17em;
-}
-#p-cactions li a:hover {
-   padding-bottom: 0.17em;
-}
-/* 5.0 doesn't like the background icon for external links and user */
-.link-external,
-.external {
-   background: none;
-   padding: 0;
-}
-#p-personal ul { float: right }
-#p-personal li { float: left }
-li#pt-userpage,
-li#pt-anonuserpage,
-li#pt-login,
-li#pt-logout {
-   background: none;
-   padding-left: none;
-}
-.visualClear {
-   width: 100%;
-   height: 0px;
-   padding: 0;
-   margin: 0;
-}
-.firstHeading { margin-bottom: 0.3em; }
\ No newline at end of file
diff --git a/resources/css/IE55Fixes.css b/resources/css/IE55Fixes.css
deleted file mode 100644
index f65fb65..000
--- a/resources/css/IE55Fixes.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* IE5.5/win- only fixes */
-
-#column-content {
-   float: none;
-   margin-left: 0;
-   height: 1%;
-}
-#column-content #content {
-   position: relative;
-   z-index: 5;
-   margin-left: 12.2em;
-   margin-top: 3em;
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   top: 0;
-   left: 0;
-   z-index: 4;
-   width: 100%;
-}
-#footer {
-   margin-left: 13.6em;
-   border-left: 1px solid #fabd23;
-}
-
-#p-personal { padding-bottom: 0.1em; }
-
-body { font-size: xx-small; }
-
-#p-cactions {
-   width: 76% !important;
-   z-index: 3 !important;
-   float: none;
-}
-#p-cactions li {
-   padding-bottom: 0 !important;
-   border: none;
-   background-color: transparent;
-   cursor: default;
-   float: none !important;
-}
-#p-cactions li a {
-   display: inline-block !important;
-   vertical-align: top;
-   padding-bottom: 0;
-   border: solid #aaa;
-   border-width: 1px 1px 0;
-}
-#p-cactions li.selected a {
-   border-color: #fabd23;
-   padding-bottom: 0.17em;
-}
-#p-cactions li a:hover {
-   padding-bottom: 0.17em;
-}
-.portlet {
-   overflow: hidden;
-}
-#bodyContent a.external {
-   background: url(../../../monobook/external-ltr.png) center right 
no-repeat;
-   padding-right: 13px;
-}
-/* show the hand */
-#p-logo a,
-#p-logo a:hover {
-   cursor: pointer;
-}
-.visualClear {
-   width: 90%;
-   height: 1px;
-   padding: 0;
-   margin: 0;
-}
-
-#editform {
-   width: 100%;
-}
\ No newline at end of file
diff --git a/resources/css/IE60Fixes.css b/resources/css/IE60Fixes.css
deleted file mode 100644
index d3a81c8..000
--- a/resources/css/IE60Fixes.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 6.0 - only fixes */
-/* content area */ 
-/* workaround for various IE float bugs */
-#column-content { 
-   float: none; 
-   margin-left: 0;
-   height: 1%;
-}
-#column-content #content {
-   margin-left: 12.2em;
-   margin-top: 3em;
-   height: 1%;
-}
-#column-one {
-   position: absolute;
-   top: 0;
-   left: 0;
-   z-index: 4;
-}
-#footer {
-   margin-left: 13.6em;
-   border-left: 1px solid #fabd23;
-}
-
-/* the tabs */
-#p-cactions {
-   z-index: 3;
-}
-
-#p-cactions li {
-   padding-bottom: 0 !important;
-   border: none;
-   background-color: transparent;
-   cursor: default;
-   float: none !important;
-}
-#p-cactions li a {
-   display: inline-block !important;
-   vertical-align: top;
-   padding-bottom: 0;
-   border: solid #aaa;
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fallback io (Ido) to eo (Esperanto)

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/324711 )

Change subject: Fallback io (Ido) to eo (Esperanto)
..


Fallback io (Ido) to eo (Esperanto)

Ido is a variant of Esperanto and all its speakers are supposed
to also know Esperanto. Either way, all translators were notified.

https://translatewiki.net/wiki/Thread:Portal_talk:Ido/Use_Esperanto_when_no_translation

From eo, io will inherit the date format, usage of space as digit separator
(consistent with most European languages), hundreds of translations for
magic words and special pages. The namespace gender alias for eo is adapted
to match the io format.

All the io.wiki and io.wiktionary users as listed by WikiStats have been
notified of the discussion individually.

Change-Id: Ia85d2e4b007b523027891bf2c2bccde55916510c
---
M languages/messages/MessagesIo.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/languages/messages/MessagesIo.php 
b/languages/messages/MessagesIo.php
index 7aae422..ffd164b 100644
--- a/languages/messages/MessagesIo.php
+++ b/languages/messages/MessagesIo.php
@@ -8,6 +8,8 @@
  *
  */
 
+$fallback = 'eo';
+
 $namespaceNames = [
NS_MEDIA=> 'Media',
NS_SPECIAL  => 'Specala',
@@ -27,6 +29,11 @@
NS_CATEGORY_TALK=> 'Kategorio_Debato',
 ];
 
+$namespaceGenderAliases = [
+   NS_USER => [ 'male' => 'Uzanto', 'female' => 'Uzantino' ],
+   NS_USER_TALK => [ 'male' => 'Uzanto_Debato', 'female' => 
'Uzantino_Debato' ],
+];
+
 $namespaceAliases = [
'Imajo' => NS_FILE,
'Imajo_Debato' => NS_FILE_TALK,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia85d2e4b007b523027891bf2c2bccde55916510c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Psychoslave 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Get rid of IE7 support for DuskToDawn

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329359 )

Change subject: Get rid of IE7 support for DuskToDawn
..


Get rid of IE7 support for DuskToDawn

Also get rid of unnecessary vendor prefixes
and clean up CSS comments, along with basic
formatting.

Bug: T154198
Change-Id: Ief2c9bd5f4a149c2ca8954715bc7fc222c3d5d3d
---
M resources/print.css
M resources/style.css
2 files changed, 100 insertions(+), 82 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/resources/print.css b/resources/print.css
index b366e28..2e6a35e 100644
--- a/resources/print.css
+++ b/resources/print.css
@@ -1,6 +1,7 @@
-/* Don't display the footer in printable mode
+/**
+ * Don't display the footer in printable mode
  * @see https://phabricator.wikimedia.org/T111434
  */
 #colophon {
display: none;
-}
\ No newline at end of file
+}
diff --git a/resources/style.css b/resources/style.css
index 472ef2e..3f76a1e 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -1,18 +1,24 @@
-/*
-Theme Name: Dusk To Dawn
-Theme URI: http://theme.wordpress.com/themes/dusk-to-dawn/
-Author: Automattic
-Author URI: http://automattic.com/
-Description: A dark theme that melds old-style organic ornaments with modern 
design and typography. It features a custom header, custom background, and a 
widget area in the sidebar. It comes with support for several post formats 
including aside, gallery, image, quote, link, chat, and audio.
-Version: 1.3
-License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: black, blue, purple, dark, two-columns, left-sidebar, right-sidebar, 
fixed-width, custom-background, custom-colors, custom-header, custom-menu, 
featured-images, full-width-template, microformats, post-formats, 
rtl-language-support, sticky-post, theme-options, translation-ready
-*/
+/**
+ * Theme Name: Dusk To Dawn
+ * Theme URI: http://theme.wordpress.com/themes/dusk-to-dawn/
+ * Author: Automattic
+ * Author URI: http://automattic.com/
+ * Description: A dark theme that melds old-style organic ornaments
+ * with modern design and typography. It features a custom header,
+ * custom background, and a widget area in the sidebar. It comes with
+ * support for several post formats including aside, gallery,
+ * image, quote, link, chat, and audio.
+ * Version: 1.3
+ * License: GNU General Public License v2 or later
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 
-/* =Reset default browser CSS. Based on work by Eric Meyer: 
http://meyerweb.com/eric/tools/css/reset/index.html
--- */
+/**
+ * Reset default browser CSS.
+ * Based on work by Eric Meyer:
+ * http://meyerweb.com/eric/tools/css/reset/index.html
+ */
 
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -32,7 +38,8 @@
padding: 0;
vertical-align: baseline;
 }
-:focus {/* remember to define focus styles! */
+:focus {
+   /* remember to define focus styles! */
outline: 0;
 }
 body {
@@ -44,7 +51,8 @@
 ol, ul {
list-style: none;
 }
-table {/* tables still need 'cellspacing="0"' in the markup */
+table {
+   /* tables still need 'cellspacing="0"' in the markup */
border-collapse: separate;
border-spacing: 0;
 }
@@ -78,8 +86,7 @@
 }
 
 
-/* =Clear
--- */
+/* Clear */
 
 .clear {
clear: both;
@@ -93,8 +100,7 @@
visibility: hidden;
 }
 
-/* =Structure
--- */
+/* Structure */
 
 html,
 body {
@@ -181,7 +187,6 @@
 .screen-reader-text,
 .assistive-text {
position: absolute !important;
-   clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
 }
 /* Alignment */
@@ -201,24 +206,16 @@
 }
 
 
-/* =Global
--- */
+/* Global */
 
 #super-super-wrapper {
-   background: linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
-   background: -o-linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
-   background: -moz-linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
-   background: -webkit-linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
-   background: -ms-linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
+   background: linear-gradient( bottom, rgb( 255,203,112 ) 0%, rgb( 
107,138,169 ) 30%, rgb( 1,44,87 ) 100% );
+   background: -o-linear-gradient( bottom, rgb( 255,203,112 ) 0%, rgb( 
107,138,169 ) 30%, rgb( 1,44,87 ) 100% );
+   background: -moz-linear-gradient( bottom, rgb(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Language fallback from Pontic (pnt) to Greek (el)

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325696 )

Change subject: Language fallback from Pontic (pnt) to Greek (el)
..


Language fallback from Pontic (pnt) to Greek (el)

The (relative) majority of speakers is estimated to live in Greece
and know Greek; for the others, intelligibility seems assured.
The language fallback was probably forgotten for a mere oversight.

https://translatewiki.net/wiki/Thread:Portal_talk:Pnt/Use_Greek_when_no_translation

In addition to the discussion between translators, every pnt.wiki
user has been alerted individually.

From el, pnt will inherit hundreds of translations for magic words,
namespaces and special page names. $linkTrail, $separatorTransformTable
and $fallback8bitEncoding are currently defined in el but not pnt.
The "ISO 8601" date format will also change definition, but the default
date format is "pnt" which is defined only for pnt.

Change-Id: I0377fff9300a8314cb9172f3be710be5dbce6825
---
M languages/messages/MessagesPnt.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/languages/messages/MessagesPnt.php 
b/languages/messages/MessagesPnt.php
index 239c888..e40b22b 100644
--- a/languages/messages/MessagesPnt.php
+++ b/languages/messages/MessagesPnt.php
@@ -16,6 +16,8 @@
  * @author ZaDiak
  */
 
+$fallback = 'el';
+
 $namespaceNames = [
NS_MEDIA=> 'Μέσον',
NS_SPECIAL  => 'Ειδικόν',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0377fff9300a8314cb9172f3be710be5dbce6825
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Reciprocal language fallback for Upper/Lower Sorbian (hsb, dsb)

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325693 )

Change subject: Reciprocal language fallback for Upper/Lower Sorbian (hsb, dsb)
..


Reciprocal language fallback for Upper/Lower Sorbian (hsb, dsb)

The two are closely related and are estimated to be 86 % mutually
intelligible in written form.

https://translatewiki.net/wiki/Thread:Portal_talk:Hsb/Fallback_to_dsb
https://translatewiki.net/wiki/Thread:Portal_talk:Dsb/Fallback_to_hsb

The two locales already have identical $dateFormats and largely
overlapping $namespaceGenderAliases and translations of namespaces,
magic words and special pages (often they differ only for diacritics
and only about a dozen of them are defined in one but not the other).

All the users with some edits on dsb.wiki, hsb.wiki, hsb.wiktionary
(as listed by WikiStats) have been notified individually.

Change-Id: Ib806387c875c1bbef180f2b85eae45c050824cb7
---
M languages/messages/MessagesDsb.php
M languages/messages/MessagesHsb.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/languages/messages/MessagesDsb.php 
b/languages/messages/MessagesDsb.php
index bce8b62..686ead0 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -8,7 +8,7 @@
  *
  */
 
-$fallback = 'de';
+$fallback = 'hsb, de';
 
 $namespaceNames = [
NS_MEDIA=> 'Medija',
diff --git a/languages/messages/MessagesHsb.php 
b/languages/messages/MessagesHsb.php
index 6aa28e5..d9471e0 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -8,7 +8,7 @@
  *
  */
 
-$fallback = 'de';
+$fallback = 'dsb, de';
 
 $namespaceNames = [
NS_MEDIA=> 'Media',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib806387c875c1bbef180f2b85eae45c050824cb7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Fixups for API error reporting refactoring

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329361 )

Change subject: Fixups for API error reporting refactoring
..


Fixups for API error reporting refactoring

Follow-up to I9c0ef778, I78f4afb7, I1e8d8dee. This is easier than amending.

* Restore support for 'parsererror' failures (they occur when there
  are stupid proxies on the way or PHP fatals happen in API code).
* Always pass the new standard API to UploadWizardLicenseInput
  (from mw.UploadWizard and uw.DeedChooserDetailsWidget) to fix error
  handling. Update mw.UploadWizardLicenseInput for 'formatversion: 2'.
* Remove silly uses of window.console.
* Restore support for mw.Message objects in uw.FieldLayout, we're still
  relying on this in a lot of places. Also, don't double-escape HTML.
* Fix error handling for chunked uploads in mw.FormDataTransport.
  (Also, remove some dead code copying this.formData twice.)
* Remove a few newly unused messages.

Change-Id: Ia48fd7842205dfba16948349b9c6acf0e9fa939c
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/details/uw.DeedChooserDetailsWidget.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/transports/mw.FormDataTransport.js
M resources/uw.FieldLayout.js
9 files changed, 37 insertions(+), 39 deletions(-)

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



diff --git a/extension.json b/extension.json
index 74d15ea..e59c411 100644
--- a/extension.json
+++ b/extension.json
@@ -261,6 +261,7 @@
"api-error-firefogg",
"api-error-noimageinfo",
"api-error-offline",
+   "api-error-parsererror",
"api-error-timeout",
"api-error-unknown-warning",
"unknown-error",
@@ -422,11 +423,8 @@
"mwe-upwiz-error-bad-descriptions",
"mwe-upwiz-error-title-blacklisted",
"mwe-upwiz-error-title-senselessimagename",
-   "mwe-upwiz-error-title-hosting",
"mwe-upwiz-error-title-invalid",
"mwe-upwiz-error-title-thumbnail",
-   
"mwe-upwiz-error-title-fileexists-shared-forbidden",
-   "mwe-upwiz-error-title-double-apostrophe",
"mwe-upwiz-error-title-extension",
"mwe-upwiz-error-title-protected",
"mwe-upwiz-error-title-duplicate",
diff --git a/i18n/en.json b/i18n/en.json
index 5b58105..e21cd55 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,6 +13,7 @@
"accesskey-cancel-upload-campaign": "c",
"group-upwizcampeditors.css": "/* CSS placed here will affect upload 
wizard campaign editors only */",
"group-upwizcampeditors.js": "/* JS placed here will affect upload 
wizard campaign editors only */",
+   "api-error-parsererror": "The server responded with an invalid JSON 
document. This could be a problem with the API, or you could be using a proxy 
server that prevents you from uploading files.",
"api-error-aborted": "Upload aborted.",
"api-error-duplicate": "There {{PLURAL:$1|is another file|are some 
other files}} already on the site with the same content.",
"api-error-duplicate-archive": "There {{PLURAL:$1|was another file|were 
some other files}} already on the site with the same content, but 
{{PLURAL:$1|it was|they were}} deleted.",
@@ -216,10 +217,7 @@
"mwe-upwiz-error-bad-descriptions": "There are problems with some of 
the descriptions.",
"mwe-upwiz-error-title-blacklisted": "This title contains some 
undesirable text. Please revise it.",
"mwe-upwiz-error-title-senselessimagename": "Please make this title 
more meaningful.",
-   "mwe-upwiz-error-title-hosting": "This looks like a file you obtained 
from another image host. Please make the title more meaningful. Also, double 
check that you have the rights to publish it on this site.",
"mwe-upwiz-error-title-thumbnail": "This looks like a thumbnail title. 
Please do not upload thumbnails back to the same wiki. Otherwise, please fix 
the filename so it is more meaningful, and does not have the thumbnail prefix.",
-   "mwe-upwiz-error-title-fileexists-shared-forbidden": "This title is 
reserved by a file on a remote shared repository. Choose another name.",
-   "mwe-upwiz-error-title-double-apostrophe": "This title contains a 
double apostrophe; please remove it.",
"mwe-upwiz-error-title-extension": "You do not need to add a file 
extension. Just make a human readable title and the application

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Use parsed error messages straight from API

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328373 )

Change subject: Use parsed error messages straight from API
..


Use parsed error messages straight from API

Since recent API error reporting refactorings, it is now
possible to request better error handling from the API,
in whatever format you prefer.

Bug: T32095
Bug: T152607
Change-Id: I1e8d8dee5b75ac9a0b08a4190153d26e0908bd9a
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/handlers/mw.ApiUploadFormDataHandler.js
M resources/handlers/mw.ApiUploadPostHandler.js
M resources/handlers/mw.FirefoggHandler.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/transports/mw.FirefoggTransport.js
M resources/transports/mw.FormDataTransport.js
M resources/uw.FieldLayout.js
M tests/qunit/transports/mw.FormDataTransport.test.js
15 files changed, 138 insertions(+), 249 deletions(-)

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



diff --git a/extension.json b/extension.json
index 51f9333..74d15ea 100644
--- a/extension.json
+++ b/extension.json
@@ -248,7 +248,6 @@

"resources/details/uw.LocationDetailsWidget.less"
],
"messages": [
-   "comma-separator",
"uploadwizard",
"uploadwizard-desc",
"mwe-upwiz-step-tutorial",
@@ -256,58 +255,17 @@
"mwe-upwiz-step-deeds",
"mwe-upwiz-step-details",
"mwe-upwiz-step-thanks",
-   "api-error-autoblocked",
-   "api-error-blocked",
-   "api-error-http",
-   "api-error-ok-but-empty",
-   "api-error-unknown-code",
-   "api-error-uploaddisabled",
-   "api-error-nomodule",
-   "api-error-mustbeposted",
-   "api-error-badaccess-groups",
-   "api-error-ratelimited",
-   "api-error-stashfailed",
-   "api-error-missingresult",
-   "api-error-missingparam",
-   "api-error-invalid-file-key",
-   "api-error-copyuploaddisabled",
-   "api-error-mustbeloggedin",
-   "api-error-empty-file",
-   "api-error-file-too-large",
-   "api-error-filetype-missing",
-   "api-error-filetype-banned",
-   "api-error-filetype-banned-type",
-   "api-error-filename-tooshort",
-   "api-error-illegal-filename",
-   "api-error-verification-error",
-   "api-error-hookaborted",
-   "api-error-unknown-error",
-   "api-error-internal-error",
-   "api-error-overwrite",
-   "api-error-badtoken",
-   "api-error-fetchfileerror",
+   "api-error-aborted",
"api-error-duplicate",
"api-error-duplicate-archive",
-   "api-error-unknown-warning",
-   "api-error-timeout",
-   "api-error-noimageinfo",
-   "api-error-fileexists-shared-forbidden",
-   "api-error-unclassified",
-   "api-error-stasherror",
-   "api-error-stashedfilenotfound",
-   "api-error-stashpathinvalid",
-   "api-error-stashfilestorage",
-   "api-error-stashzerolength",
-   "api-error-stashnotloggedin",
-   "api-error-stashwrongowner",
-   "api-error-stashnosuchfilekey",
-   "api-error-abusefilter-warning",
-   "api-error-abusefilter-disallowed",
-   "api-error-spamblacklist",
-   "api-error-offline",
-   "api-error-parsererror",
"api-error-firefogg",
-

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Standardize on `code, result` params for deferred rejections

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328372 )

Change subject: Standardize on `code, result` params for deferred rejections
..


Standardize on `code, result` params for deferred rejections

Deferreds were being rejected very inconsistently. This made it
hard to handle them properly, as you'd have to backtrack multiple
methods to figure out what kind of data you could expect to deal
with (and often, you could be dealing with multiple different
types of params, eventually)
This will standardize all API call rejections to `code, result`,
where code is the error code (string) and result is the response
object that is guaranteed to have a `code` and `info` key (both
strings)

Change-Id: I78f4afb717b783ab24dcdf0140783eb4f469
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/handlers/mw.ApiUploadFormDataHandler.js
M resources/handlers/mw.ApiUploadPostHandler.js
M resources/handlers/mw.FirefoggHandler.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/transports/mw.FirefoggTransport.js
M resources/transports/mw.FormDataTransport.js
M tests/qunit/transports/mw.FormDataTransport.test.js
14 files changed, 194 insertions(+), 171 deletions(-)

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



diff --git a/extension.json b/extension.json
index aa73e19..51f9333 100644
--- a/extension.json
+++ b/extension.json
@@ -306,6 +306,8 @@
"api-error-spamblacklist",
"api-error-offline",
"api-error-parsererror",
+   "api-error-firefogg",
+   "api-error-aborted",
"mwe-upwiz-api-warning-was-deleted",
"mwe-upwiz-api-warning-exists",

"mwe-upwiz-tutorial-error-localized-file-missing",
diff --git a/i18n/en.json b/i18n/en.json
index 7039f9d..9369e94 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -18,6 +18,8 @@
"api-error-spamblacklist": "The text you wanted to save was blocked by 
the spam filter.\nThis is probably caused by a link to a blacklisted external 
site.",
"api-error-offline": "Could not proceed due to network connectivity 
issues. Make sure you have a working internet connection and try again.",
"api-error-parsererror": "The server responded with an invalid JSON 
document. This could be a problem with the API, or you could be using a proxy 
server that prevents you from uploading files.",
+   "api-error-firefogg": "Encoding failed.",
+   "api-error-aborted": "Upload aborted.",
"mwe-upwiz-unavailable": "Your browser is not compatible with 
UploadWizard or has JavaScript turned off, so we are showing you a simple 
upload form. ([https://www.mediawiki.org/wiki/UploadWizard#Compatibility View 
compatibility requirements].)",
"mwe-upwiz-extension-disabled": "This page has been disabled due to 
temporary technical problems. In the meantime try the standard upload form.",
"mwe-upwiz-step-tutorial": "Learn",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3d4406f..2cababe 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -44,6 +44,8 @@
"api-error-spamblacklist": "API error message that can be used for 
client side localisation of API errors. This is a shorter version of 
{{msg-mw|spamprotectiontext}} that is specific to file uploads.",
"api-error-offline": "Error message for when files could not be 
uploaded as a result of bad/lost internet connection.",
"api-error-parsererror": "Error message for when, for an unknown 
reason, the server sent the client an invalid response.",
+   "api-error-firefogg": "Error message for when encoding of ogg files 
fails.",
+   "api-error-aborted": "Error message for when an upload was aborted.",
"mwe-upwiz-unavailable": "Shown if the user visits Special:UploadWizard 
using a browser that can't display the wizard due to JavaScript being disabled 
or lack of support for modern features.",
"mwe-upwiz-extension-disabled": "Shown if the UploadWizard page has 
been disabled.",
"mwe-upwiz-step-tutorial": "{| align=\"right\"\n| 
[[file:commons-uw-L524.png|Initial \"{{MediaWiki:mwe-upwiz-step-file/en}}\" 
page|thumb|right]]\n| [[file:commons-uw-L521.png|Beginning of 
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n| 
[[file:commons-uw-L522.png|Center of 
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n| 
[[file:commons-uw-L523.png|End of \"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" 
page|thumb|right]]\n|} This is a short greyed or bolded label, in the top bar 
of all pages of the

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist user SamanthaNguyen

2016-12-27 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329362 )

Change subject: Whitelist user SamanthaNguyen
..

Whitelist user SamanthaNguyen

Whitelists

samanthanguyen1...@gmail.com

codynguyen1...@gmail.com

Change-Id: I789517020e10445a5f052e15a5951c23461f898c
---
M zuul/layout.yaml
1 file changed, 9,032 insertions(+), 9,028 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/62/329362/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I789517020e10445a5f052e15a5951c23461f898c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Use mw.Api instead of XMLHttpRequest

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328371 )

Change subject: Use mw.Api instead of XMLHttpRequest
..


Use mw.Api instead of XMLHttpRequest

This removes some very specific code (e.g. FormData object)
that is not commonly used in MW, and mw.Api supports already.
It makes it easier to work with, the response is now just
a promise like everywhere else. We no longer need to subscribe
to these events and have our own handler to parse the response.

Bug: T94099
Change-Id: I9c0ef7780dd152d973afac5ff5ea631465d8a15a
---
M resources/handlers/mw.ApiUploadFormDataHandler.js
M resources/handlers/mw.FirefoggHandler.js
M resources/mw.UploadWizard.js
M resources/transports/mw.FormDataTransport.js
M tests/qunit/transports/mw.FormDataTransport.test.js
5 files changed, 140 insertions(+), 178 deletions(-)

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



diff --git a/resources/handlers/mw.ApiUploadFormDataHandler.js 
b/resources/handlers/mw.ApiUploadFormDataHandler.js
index 3d88797..f0622ed 100644
--- a/resources/handlers/mw.ApiUploadFormDataHandler.js
+++ b/resources/handlers/mw.ApiUploadFormDataHandler.js
@@ -23,7 +23,7 @@
} );
 
this.transport = new mw.FormDataTransport(
-   this.api.defaults.ajax.url,
+   this.api,
this.formData
).on( 'update-stage', function ( stage ) {
upload.ui.setStatus( 'mwe-upwiz-' + stage );
@@ -60,7 +60,7 @@
return handler.transport.upload( 
handler.upload.file, handler.upload.title.getMainText() )
.progress( function ( fraction ) {
if ( handler.upload.state === 
'aborted' ) {
-   
handler.transport.xhr.abort();
+   
handler.transport.api.abort();
return;
}
 
@@ -72,7 +72,7 @@

uw.eventFlowLogger.logApiError( 'file', result );
}
handler.upload.setTransported( 
result );
-   }, function ( result ) {
+   }, function ( code, info, result ) {
if ( !result || result.error || 
( result.upload && result.upload.warnings ) ) {

uw.eventFlowLogger.logApiError( 'file', result );
}
diff --git a/resources/handlers/mw.FirefoggHandler.js 
b/resources/handlers/mw.FirefoggHandler.js
index dca4123..7244ad2 100644
--- a/resources/handlers/mw.FirefoggHandler.js
+++ b/resources/handlers/mw.FirefoggHandler.js
@@ -96,7 +96,7 @@
upload.file = file;
transport.uploadHandler = new 
mw.ApiUploadFormDataHandler( upload, handler.api );
return transport.uploadHandler.start();
-   }, function ( result ) {
+   }, function ( code, info, result ) {
mw.log( 
'FirefoggTransport::getTransport> Transport done ' + JSON.stringify( result ) );
upload.setTransported( result );
} );
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 98d4651..5a0e230 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -6,7 +6,7 @@
mw.UploadWizard = function ( config ) {
var maxSimPref;
 
-   this.api = new mw.Api( { ajax: { timeout: 0 } } );
+   this.api = this.getApi( { ajax: { timeout: 0 } } );
 
// making a sort of global for now, should be done by passing 
in config or fragments of config
// when needed elsewhere
@@ -83,6 +83,38 @@
this.steps.thanks.setNextStep( this.steps.file );
 
$( '#mwe-upwiz-steps' ).arrowSteps();
+   },
+
+   /**
+* @param {Object} options
+* @return {mw.Api}
+*/
+   getApi: function ( options ) {
+   var api = new mw.Api( options );
+
+   api.ajax = function ( parameters, ajaxOptions ) {
+   return mw.Api.prototype.ajax.apply( this, [ 
parameters, ajaxOptions ] ).then(
+   null, // done handler -

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Fixups for API error reporting refactoring

2016-12-27 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329361 )

Change subject: Fixups for API error reporting refactoring
..

Fixups for API error reporting refactoring

Follow-up to I9c0ef778, I78f4afb7, I1e8d8dee. This is easier than amending.

* Restore support for 'parsererror' failures (they occur when there
  are stupid proxies on the way or PHP fatals happen in API code).
* Always pass the new standard API to UploadWizardLicenseInput
  (from mw.UploadWizard and uw.DeedChooserDetailsWidget) to fix error
  handling. Update mw.UploadWizardLicenseInput for 'formatversion: 2'.
* Remove silly uses of window.console.
* Restore support for mw.Message objects in uw.FieldLayout, we're still
  relying on this in a lot of places. Also, don't double-escape HTML.
* Fix error handling for chunked uploads in mw.FormDataTransport.
  (Also, remove some dead code copying this.formData twice.)
* Remove a few newly unused messages.

Change-Id: Ia48fd7842205dfba16948349b9c6acf0e9fa939c
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/details/uw.DeedChooserDetailsWidget.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/transports/mw.FormDataTransport.js
M resources/uw.FieldLayout.js
9 files changed, 37 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/61/329361/1

diff --git a/extension.json b/extension.json
index 74d15ea..e59c411 100644
--- a/extension.json
+++ b/extension.json
@@ -261,6 +261,7 @@
"api-error-firefogg",
"api-error-noimageinfo",
"api-error-offline",
+   "api-error-parsererror",
"api-error-timeout",
"api-error-unknown-warning",
"unknown-error",
@@ -422,11 +423,8 @@
"mwe-upwiz-error-bad-descriptions",
"mwe-upwiz-error-title-blacklisted",
"mwe-upwiz-error-title-senselessimagename",
-   "mwe-upwiz-error-title-hosting",
"mwe-upwiz-error-title-invalid",
"mwe-upwiz-error-title-thumbnail",
-   
"mwe-upwiz-error-title-fileexists-shared-forbidden",
-   "mwe-upwiz-error-title-double-apostrophe",
"mwe-upwiz-error-title-extension",
"mwe-upwiz-error-title-protected",
"mwe-upwiz-error-title-duplicate",
diff --git a/i18n/en.json b/i18n/en.json
index 5b58105..e21cd55 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,6 +13,7 @@
"accesskey-cancel-upload-campaign": "c",
"group-upwizcampeditors.css": "/* CSS placed here will affect upload 
wizard campaign editors only */",
"group-upwizcampeditors.js": "/* JS placed here will affect upload 
wizard campaign editors only */",
+   "api-error-parsererror": "The server responded with an invalid JSON 
document. This could be a problem with the API, or you could be using a proxy 
server that prevents you from uploading files.",
"api-error-aborted": "Upload aborted.",
"api-error-duplicate": "There {{PLURAL:$1|is another file|are some 
other files}} already on the site with the same content.",
"api-error-duplicate-archive": "There {{PLURAL:$1|was another file|were 
some other files}} already on the site with the same content, but 
{{PLURAL:$1|it was|they were}} deleted.",
@@ -216,10 +217,7 @@
"mwe-upwiz-error-bad-descriptions": "There are problems with some of 
the descriptions.",
"mwe-upwiz-error-title-blacklisted": "This title contains some 
undesirable text. Please revise it.",
"mwe-upwiz-error-title-senselessimagename": "Please make this title 
more meaningful.",
-   "mwe-upwiz-error-title-hosting": "This looks like a file you obtained 
from another image host. Please make the title more meaningful. Also, double 
check that you have the rights to publish it on this site.",
"mwe-upwiz-error-title-thumbnail": "This looks like a thumbnail title. 
Please do not upload thumbnails back to the same wiki. Otherwise, please fix 
the filename so it is more meaningful, and does not have the thumbnail prefix.",
-   "mwe-upwiz-error-title-fileexists-shared-forbidden": "This title is 
reserved by a file on a remote shared repository. Choose another name.",
-   "mwe-upwiz-error-title-double-apostrophe": "This title contains a 
double apostrophe; please remove it.",
"mwe-upwiz-error-title-extension": "You do not need to add a file 
extension. Just make a human readable title

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Query string dictionary parameter for pwb.comms.http.fetch

2016-12-27 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329360 )

Change subject: Query string dictionary parameter for pwb.comms.http.fetch
..

Query string dictionary parameter for pwb.comms.http.fetch

New "params" parameter to pass unencoded query string parameters as a
dictionary to pywikibot.comms.http.fetch.
PetScanPageGenerator has been updated to use this new parameter.

Bug: T153559
Change-Id: I96da6d4c719aba24d35e58dd5f0694e628be86a3
---
M pywikibot/comms/http.py
M pywikibot/comms/threadedhttp.py
M pywikibot/pagegenerators.py
3 files changed, 11 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/60/329360/1

diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index 7bf6235..a55dd71 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -350,6 +350,7 @@
 def _http_process(session, http_request):
 method = http_request.method
 uri = http_request.uri
+params = http_request.params
 body = http_request.body
 headers = http_request.headers
 if PY2 and headers:
@@ -370,8 +371,8 @@
 # Note that the connections are pooled which mean that a future
 # HTTPS request can succeed even if the certificate is invalid and
 # verify=True, when a request with verify=False happened before
-response = session.request(method, uri, data=body, headers=headers,
-   auth=auth, timeout=timeout,
+response = session.request(method, uri, params=params, data=body,
+   headers=headers, auth=auth, timeout=timeout,
verify=not ignore_validation)
 except Exception as e:
 http_request.data = e
@@ -407,7 +408,7 @@
 warning('Http response status {0}'.format(request.data.status_code))
 
 
-def _enqueue(uri, method="GET", body=None, headers=None, **kwargs):
+def _enqueue(uri, method="GET", params=None, body=None, headers=None, 
**kwargs):
 """
 Enqueue non-blocking threaded HTTP request with callback.
 
@@ -451,12 +452,12 @@
 all_headers['user-agent'] = user_agent(None, user_agent_format_string)
 
 request = threadedhttp.HttpRequest(
-uri, method, body, all_headers, callbacks, **kwargs)
+uri, method, params, body, all_headers, callbacks, **kwargs)
 _http_process(session, request)
 return request
 
 
-def fetch(uri, method="GET", body=None, headers=None,
+def fetch(uri, method="GET", params=None, body=None, headers=None,
   default_error_handling=True, use_fake_user_agent=False, **kwargs):
 """
 Blocking HTTP request.
@@ -489,7 +490,7 @@
 elif use_fake_user_agent is True:
 headers['user-agent'] = fake_user_agent()
 
-request = _enqueue(uri, method, body, headers, **kwargs)
+request = _enqueue(uri, method, params, body, headers, **kwargs)
 assert(request._data is not None)  # if there's no data in the answer 
we're in trouble
 # Run the error handling callback in the callers thread so exceptions
 # may be caught.
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index a166929..03386cf 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -31,7 +31,7 @@
 * an exception
 """
 
-def __init__(self, uri, method="GET", body=None, headers=None,
+def __init__(self, uri, method="GET", params=None, body=None, headers=None,
  callbacks=None, charset=None, **kwargs):
 """
 Constructor.
@@ -40,6 +40,7 @@
 """
 self.uri = uri
 self.method = method
+self.params = params
 self.body = body
 self.headers = headers
 if isinstance(charset, codecs.CodecInfo):
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 3db16a7..e30668f 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2840,14 +2840,9 @@
 
 def query(self):
 """Query PetScan."""
-url = urlparse.urlunparse(('https',   # scheme
-   'petscan.wmflabs.org', # netloc
-   '',# path
-   '',# params
-   urlencode(self.opts),  # query
-   ''))   # fragment
+url = 'https://petscan.wmflabs.org'
 
-req = http.fetch(url)
+req = http.fetch(url, params=self.opts)
 j = json.loads(req.content)
 raw_pages = j['*'][0]['a']['*']
 for raw_page in raw_pages:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Get rid of IE7 support for DuskToDawn

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329359 )

Change subject: Get rid of IE7 support for DuskToDawn
..

Get rid of IE7 support for DuskToDawn

Bug: T154198
Change-Id: Ief2c9bd5f4a149c2ca8954715bc7fc222c3d5d3d
---
M resources/print.css
M resources/style.css
2 files changed, 40 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn 
refs/changes/59/329359/1

diff --git a/resources/print.css b/resources/print.css
index b366e28..2e6a35e 100644
--- a/resources/print.css
+++ b/resources/print.css
@@ -1,6 +1,7 @@
-/* Don't display the footer in printable mode
+/**
+ * Don't display the footer in printable mode
  * @see https://phabricator.wikimedia.org/T111434
  */
 #colophon {
display: none;
-}
\ No newline at end of file
+}
diff --git a/resources/style.css b/resources/style.css
index 472ef2e..a0f605f 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -1,18 +1,24 @@
-/*
-Theme Name: Dusk To Dawn
-Theme URI: http://theme.wordpress.com/themes/dusk-to-dawn/
-Author: Automattic
-Author URI: http://automattic.com/
-Description: A dark theme that melds old-style organic ornaments with modern 
design and typography. It features a custom header, custom background, and a 
widget area in the sidebar. It comes with support for several post formats 
including aside, gallery, image, quote, link, chat, and audio.
-Version: 1.3
-License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: black, blue, purple, dark, two-columns, left-sidebar, right-sidebar, 
fixed-width, custom-background, custom-colors, custom-header, custom-menu, 
featured-images, full-width-template, microformats, post-formats, 
rtl-language-support, sticky-post, theme-options, translation-ready
-*/
+/**
+ * Theme Name: Dusk To Dawn
+ * Theme URI: http://theme.wordpress.com/themes/dusk-to-dawn/
+ * Author: Automattic
+ * Author URI: http://automattic.com/
+ * Description: A dark theme that melds old-style organic ornaments
+ * with modern design and typography. It features a custom header,
+ * custom background, and a widget area in the sidebar. It comes with
+ * support for several post formats including aside, gallery,
+ * image, quote, link, chat, and audio.
+ * Version: 1.3
+ * License: GNU General Public License v2 or later
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 
-/* =Reset default browser CSS. Based on work by Eric Meyer: 
http://meyerweb.com/eric/tools/css/reset/index.html
--- */
+/**
+ * Reset default browser CSS.
+ * Based on work by Eric Meyer:
+ * http://meyerweb.com/eric/tools/css/reset/index.html
+ */
 
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -32,7 +38,8 @@
padding: 0;
vertical-align: baseline;
 }
-:focus {/* remember to define focus styles! */
+:focus {
+   /* remember to define focus styles! */
outline: 0;
 }
 body {
@@ -44,7 +51,8 @@
 ol, ul {
list-style: none;
 }
-table {/* tables still need 'cellspacing="0"' in the markup */
+table {
+   /* tables still need 'cellspacing="0"' in the markup */
border-collapse: separate;
border-spacing: 0;
 }
@@ -78,8 +86,7 @@
 }
 
 
-/* =Clear
--- */
+/* Clear */
 
 .clear {
clear: both;
@@ -93,8 +100,7 @@
visibility: hidden;
 }
 
-/* =Structure
--- */
+/* Structure */
 
 html,
 body {
@@ -201,8 +207,7 @@
 }
 
 
-/* =Global
--- */
+/* Global */
 
 #super-super-wrapper {
background: linear-gradient(bottom, rgb(255,203,112) 0%, 
rgb(107,138,169) 30%, rgb(1,44,87) 100%);
@@ -376,16 +381,13 @@
top: .5ex;
 }
 
-
-/* =Forms
--- */
+/* Forms */
 
 input[type=text],
 input[type=email],
 input[type=password],
 textarea {
background: #fafafa;
-   -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
border: 1px solid #e7d9b9;
border-radius: 3px;
@@ -434,8 +436,7 @@
 }
 
 
-/* =Header
--- */
+/* Header */
 
 #branding hgroup {
background-color: #0b0e18;
@@ -468,8 +469,7 @@
 }
 
 
-/* =Content
--- */
+/* Content */
 
 .sticky {
background-color: #f6f6f6;
@@ -754,8 +754,7 @@
 }
 
 
-/* =Post Formats
--- */
+/* Post Formats */
 
 .entry-format:after {
content: '\0020\2013';
@@ -814,7 +813,7 @@
 }
 
 /* =Images

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove duplicate field in import fields array.

2016-12-27 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329358 )

Change subject: Remove duplicate field in import fields array.
..

Remove duplicate field in import fields array.

Bug: T153791
Change-Id: I3876bf75026a1849c8939eeeb1a5689e6d23c609
---
M sites/all/modules/offline2civicrm/ChecksFile.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/58/329358/1

diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php 
b/sites/all/modules/offline2civicrm/ChecksFile.php
index 06c4d07..ae619d0 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -412,7 +412,6 @@
 'Additional Address 2' => 'supplemental_address_2',
 'Batch' => 'import_batch_number', # deprecated, use External Batch 
Number instead.
 'Banner' => 'utm_source',
-'Batch' => 'import_batch_number',
 'Campaign' => 'utm_campaign',
 'Check Number' => 'check_number',
 'City' => 'city',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add preliminary CoinBase Test.

2016-12-27 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329357 )

Change subject: Add preliminary CoinBase Test.
..

Add preliminary CoinBase Test.

Bug: T153791
Change-Id: Ie7e0931986e92159c2fdb323b994245669a49f90
---
A sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
A sites/all/modules/offline2civicrm/tests/data/coinbase.csv
2 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/329357/1

diff --git a/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php 
b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
new file mode 100644
index 000..91e1744
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/tests/CoinBaseTest.php
@@ -0,0 +1,31 @@
+epochtime = wmf_common_date_parse_string('2016-09-15');
+$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 
3));
+$this->gateway = 'coinbase';
+}
+
+function testImport() {
+civicrm_initialize();
+$this->trxn_id = 'Pluto';
+$this->doCleanUp();
+
+$importer = new CoinbaseFile( __DIR__ . "/data/coinbase.csv" );
+$importer->import();
+
+$contribution = 
wmf_civicrm_get_contributions_from_gateway_id($this->gateway, $this->trxn_id);
+$this->assertEquals( 1, count( $contribution ) );
+$this->assertEquals( 'COINBASE PLUTO', $contribution[0]['trxn_id'] );
+}
+
+}
diff --git a/sites/all/modules/offline2civicrm/tests/data/coinbase.csv 
b/sites/all/modules/offline2civicrm/tests/data/coinbase.csv
new file mode 100644
index 000..b336848
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/tests/data/coinbase.csv
@@ -0,0 +1,2 @@
+BTC Price,Currency,Customer Email,Native Price,Phone Number,Recurring Payment 
ID,Refund Transaction ID,Shipping Address 1,Shipping Address 2,Shipping 
City,Shipping Country,Shipping Name,Shipping Postal Code,Shipping 
State,Status,Timestamp,Tracking Code
+5.0009,BTC,mic...@mouse.com,1,456 789,,,52 Disney Lane,,Disneyland,US,Mickey 
Mouse2016-09-15,Pluto

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Consolidate test cleanup routine into parent class

2016-12-27 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329356 )

Change subject: Consolidate test cleanup routine into parent class
..

Consolidate test cleanup routine into parent class

Change-Id: I2e29ba761dbf00f3893de9f82276a6c0c4aba034
---
M sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
M sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
2 files changed, 30 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/56/329356/1

diff --git a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php 
b/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
index e677c9e..c949e77 100644
--- a/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
+++ b/sites/all/modules/offline2civicrm/tests/JpMorganFileTest.php
@@ -16,6 +16,7 @@
 $this->strtime = '04/02/2000';
 $this->epochtime = wmf_common_date_parse_string('2000-04-02');
 $this->setExchangeRates( $this->epochtime, array( 'USD' => 1, 'EUR' => 
3 ) );
+$this->gateway = 'jpmorgan';
 }
 
 function testParseRow() {
@@ -58,20 +59,9 @@
 function testImport() {
 //FIXME
 $_GET['q'] = '';
-//FIXME
 civicrm_initialize();
-
-// Clean slate.
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
'jpmorgan', '1234TEST' );
-if ( $contributions ) {
-foreach ( $contributions as $existing ) {
-$success = civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $existing['id'],
-'version' => 3,
-) );
-$this->assertTrue( $success );
-}
-}
+$this->trxn_id = '1234TEST';
+$this->doCleanUp();
 
 $this->setExchangeRates( wmf_common_date_parse_string( '2000-04-01' ), 
array( 'USD' => 1, 'EUR' => 3 ) );
 
diff --git 
a/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
index ee09c73..6132b09 100644
--- a/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
+++ b/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
@@ -1,6 +1,21 @@
 gateway, $this->trxn_id);
+  if ($contributions) {
+foreach ($contributions as $contribution) {
+  $this->callAPISuccess('Contribution', 'delete', array('id' => 
$contribution['id']));
+}
+  }
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Get rid of support for IE7 in Gamepress

2016-12-27 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329355 )

Change subject: Get rid of support for IE7 in Gamepress
..


Get rid of support for IE7 in Gamepress

Bug: T154197
Change-Id: I390c3458aa778ad943c37d8e04155b0b782c3bee
---
M resources/css/style_ie.css
1 file changed, 10 insertions(+), 19 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/resources/css/style_ie.css b/resources/css/style_ie.css
index 70b277e..c0356ef 100644
--- a/resources/css/style_ie.css
+++ b/resources/css/style_ie.css
@@ -1,15 +1,11 @@
-/*
+/**
+ * Theme Name: Evolved
+ * Description: Evoved - Gaming HTML Template
+ * Author: sunaprticle (http://themeforest.net/user/sunparticle)
+ * Author URI: http://webtuts.pl
+ */
 
-   Theme Name: Evolved
-   Description: Evoved - Gaming HTML Template
-   Author: sunaprticle (http://themeforest.net/user/sunparticle)
-   Author URI: http://webtuts.pl
-
-*/
-
-/*---*/
-/* IE-specific workarounds
-/*---*/
+/* IE specific workarounds */
 #header {
position: relative;
z-index: 20;
@@ -37,10 +33,9 @@
 
 #primary-nav ul {
width: auto;
-   filter: alpha(opacity=0); /* IE 7 and Earlier */
-/* Next 2 lines IE8 */
--ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+   /* IE8 */
+   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
 }
 
 #primary-nav ul li{
@@ -64,7 +59,3 @@
margin: 0;
width: auto;
 }
-
-.before-img-bevel-fix {
-   filter: alpha(opacity=20); /* IE 7 and Earlier */
-}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I390c3458aa778ad943c37d8e04155b0b782c3bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Get rid of support for IE7 in Gamepress

2016-12-27 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329355 )

Change subject: Get rid of support for IE7 in Gamepress
..

Get rid of support for IE7 in Gamepress

Bug: T154197
Change-Id: I390c3458aa778ad943c37d8e04155b0b782c3bee
---
M resources/css/style_ie.css
1 file changed, 10 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress 
refs/changes/55/329355/1

diff --git a/resources/css/style_ie.css b/resources/css/style_ie.css
index 70b277e..c0356ef 100644
--- a/resources/css/style_ie.css
+++ b/resources/css/style_ie.css
@@ -1,15 +1,11 @@
-/*
+/**
+ * Theme Name: Evolved
+ * Description: Evoved - Gaming HTML Template
+ * Author: sunaprticle (http://themeforest.net/user/sunparticle)
+ * Author URI: http://webtuts.pl
+ */
 
-   Theme Name: Evolved
-   Description: Evoved - Gaming HTML Template
-   Author: sunaprticle (http://themeforest.net/user/sunparticle)
-   Author URI: http://webtuts.pl
-
-*/
-
-/*---*/
-/* IE-specific workarounds
-/*---*/
+/* IE specific workarounds */
 #header {
position: relative;
z-index: 20;
@@ -37,10 +33,9 @@
 
 #primary-nav ul {
width: auto;
-   filter: alpha(opacity=0); /* IE 7 and Earlier */
-/* Next 2 lines IE8 */
--ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+   /* IE8 */
+   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
 }
 
 #primary-nav ul li{
@@ -64,7 +59,3 @@
margin: 0;
width: auto;
 }
-
-.before-img-bevel-fix {
-   filter: alpha(opacity=20); /* IE 7 and Earlier */
-}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I390c3458aa778ad943c37d8e04155b0b782c3bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Consolidate test data into one directory.

2016-12-27 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329354 )

Change subject: Consolidate test data into one directory.
..

Consolidate test data into one directory.

I couldn't find any usage of the banner sql so removing that - tests will fail 
if I am wrong

Change-Id: I7f322a3870a54ded0472e66cd6639f0374ed0636
---
D sites/all/modules/offline2civicrm/test_data/bannerimpressions.sql
M sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
R sites/all/modules/offline2civicrm/tests/data/engage.csv
R sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
R sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
5 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/54/329354/1

diff --git a/sites/all/modules/offline2civicrm/test_data/bannerimpressions.sql 
b/sites/all/modules/offline2civicrm/test_data/bannerimpressions.sql
deleted file mode 100644
index 963c72a..000
--- a/sites/all/modules/offline2civicrm/test_data/bannerimpressions.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-insert into pgehres.bannerimpressions (banner, campaign, count)
-select
-   (select utm_source from drupal.contribution_tracking order by rand() 
limit 1),
-   (select utm_campaign from drupal.contribution_tracking order by rand() 
limit 1),
-   round(rand() * 1);
diff --git a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
index ab99b80..70b7c04 100644
--- a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
+++ b/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
@@ -149,7 +149,7 @@
 
 public function testImporterCreatesOutputFiles() {
   civicrm_initialize();
-  $this->sourceFileUri = __DIR__ . '/../test_data/engage_reduced.csv';
+  $this->sourceFileUri = __DIR__ . '/../tests/data/engage_reduced.csv';
   $fileUri = $this->setupFile('engage_reduced.csv');
 
   $importer = new EngageChecksFile($fileUri);
@@ -248,7 +248,7 @@
* @return string
*/
   public function setupFile($inputFileName) {
-$this->sourceFileUri = __DIR__ . '/../test_data/' . $inputFileName;
+$this->sourceFileUri = __DIR__ . '/../tests/data/' . $inputFileName;
 $this->purgePreviousData();
 
 // copy the file to a temp dir so copies are made in the temp dir.
diff --git a/sites/all/modules/offline2civicrm/test_data/engage.csv 
b/sites/all/modules/offline2civicrm/tests/data/engage.csv
similarity index 100%
rename from sites/all/modules/offline2civicrm/test_data/engage.csv
rename to sites/all/modules/offline2civicrm/tests/data/engage.csv
diff --git a/sites/all/modules/offline2civicrm/test_data/engage_postal.csv 
b/sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
similarity index 100%
rename from sites/all/modules/offline2civicrm/test_data/engage_postal.csv
rename to sites/all/modules/offline2civicrm/tests/data/engage_postal.csv
diff --git a/sites/all/modules/offline2civicrm/test_data/engage_reduced.csv 
b/sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv
similarity index 100%
rename from sites/all/modules/offline2civicrm/test_data/engage_reduced.csv
rename to sites/all/modules/offline2civicrm/tests/data/engage_reduced.csv

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix T154194: bubble chart url off-by-one error

2016-12-27 Thread Lucas Werkmeister (Code Review)

Lucas Werkmeister has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329353 )

Change subject: Fix T154194: bubble chart url off-by-one error
..

Fix T154194: bubble chart url off-by-one error

The bubble chart iterates over all rows and columns, but barely uses the
column iteration: the item is filled in almost completely as soon as the
next row is seen, accessing the correct indexes in the full row right
away. This works for label, number, rgb, but not URL – the URL is
actually searched in all columns.

Previously, the assumption was that the URL column is the first one: in
that case, the url variable is set as soon as the next row is seen, and
then the item is immediately created with the value of the url variable.
But if the URL column isn’t the first one, this means that the item will
instead be populated with the previous row’s URL, which is still
leftover in the url variable. The url variable is then set to the
current row’s URL when that column is reached, but by that point the
item isn’t updated, so the url variable is only read by the next item
again.

Instead, get the last item and set its URL after the rollover. If the
URL column is the first one, then the rollover and the URL setting will
happen in the same iteration, but if it isn’t, the URL is still set on
the correct item.

Change-Id: I2fe1b4b7a7fc26468f2fdeea1e54ed6f850123fb
---
M wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
1 file changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/53/329353/1

diff --git a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
index 913590a..6fb381e 100644
--- a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
@@ -42,19 +42,14 @@
var data = {
'name': 'bubblechart',
'children': []
-   }, labelKey = this._getLabelColumns()[0], numberKey = 
this._getNumberColumns()[0], prevRow = null, url = null;
+   }, labelKey = this._getLabelColumns()[0], numberKey = 
this._getNumberColumns()[0], prevRow = null;
 
this._iterateResult( function( field, key, row ) {
 
-   if ( field && field.value && 
self._getFormatter().isExploreUrl( field.value ) ) {
-   url = field.value;
-   }
-
if ( row !== prevRow ) {
var item = {
-   url: url
+   url: null
};
-   url = null;
prevRow = row;
 
 if ( row.rgb && self._getFormatter().isColor( row.rgb ) ) {
@@ -67,6 +62,13 @@
data.children.push( item );
}
}
+
+   if ( field && field.value && 
self._getFormatter().isExploreUrl( field.value ) ) {
+var createdItem = data.children[data.children.length - 1];
+if ( createdItem.url === null ) {
+createdItem.url = field.value;
+}
+   }
} );
 
var $wrapper = $( '' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fe1b4b7a7fc26468f2fdeea1e54ed6f850123fb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix typo in abusefilter-edit-builder-vars-user-age

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329343 )

Change subject: Fix typo in abusefilter-edit-builder-vars-user-age
..


Fix typo in abusefilter-edit-builder-vars-user-age

Change-Id: I8ac030d5e620d4d6061c7360d61a5fe6c817e13c
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 0b8c9a8..b4440cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -263,7 +263,7 @@
"abusefilter-edit-builder-vars-movedto-text": "Title of move 
destination page",
"abusefilter-edit-builder-vars-movedto-prefixedtext": "Full title of 
move destination page",
"abusefilter-edit-builder-vars-user-editcount": "Edit count of the 
user",
-   "abusefilter-edit-builder-vars-user-age": "Age of user the account",
+   "abusefilter-edit-builder-vars-user-age": "Age of the user account",
"abusefilter-edit-builder-vars-user-name": "Name of the user account",
"abusefilter-edit-builder-vars-user-groups": "Groups (including 
implicit) the user is in",
"abusefilter-edit-builder-vars-user-rights": "Rights that the user has",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ac030d5e620d4d6061c7360d61a5fe6c817e13c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Cleanup in TemplateHandler

2016-12-27 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329352 )

Change subject: Cleanup in TemplateHandler
..

Cleanup in TemplateHandler

* Removed stale code and refactored control flow to make the
  logic a bit more clearer. There was (and still is) a fair bit
  of cruft here.

Change-Id: I0a7e3a593eca93a0e4fd9fbac6cfde803ebd524c
---
M lib/wt2html/tt/TemplateHandler.js
M tests/parserTests.txt
2 files changed, 89 insertions(+), 94 deletions(-)


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

diff --git a/lib/wt2html/tt/TemplateHandler.js 
b/lib/wt2html/tt/TemplateHandler.js
index e11ad4f..e42c8df 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -63,51 +63,50 @@
  * processes the template.
  */
 TemplateHandler.prototype.onTemplate = function(token, frame, cb) {
+   var atm;
var env = this.env;
-
-   // magic word variables can be mistaken for templates
-   try {
-   var magicWord = this.checkForMagicWordVariable(token);
-   if (magicWord) {
-   cb({ tokens: Array.isArray(magicWord) ? magicWord : 
[magicWord] });
-   return;
-   }
-   } catch (e) {
-   env.log("error", "Exception checking magic word for token: ", 
token);
-   }
-
+   var text = token.dataAttribs.src;
var state = {
token: token,
wrapperType: 'mw:Transclusion',
wrappedObjectId: env.newObjectId(),
+   recordArgDict: this.options.wrapTemplates,
srcCB: this._startTokenPipeline,
-   };
-
-   if (this.options.wrapTemplates) {
-   state.recordArgDict = true;
 
// Uncomment to use DOM-based template expansion
// TODO gwicke: Determine when to use this!
// - Collect stats per template and classify templates into
-   // balanced/unbalanced ones based on it
+   //   balanced/unbalanced ones based on it
// - Always force nesting for new templates inserted by the VE
-   //  state.srcCB = this._startDocumentPipeline;
-
+   //
// Default to 'safe' token-based template encapsulation for now.
+   //
+   // srcCB: this._startDocumentPipeline
+   };
+
+   var tgt = this.resolveTemplateTarget(state, token.attribs[0].k);
+   if (tgt && (tgt.isPF || tgt.isMagicWord)) {
+   // magic word variables can be mistaken for templates
+   try {
+   var magicWord = this.checkForMagicWordVariable(token);
+   if (magicWord) {
+   cb({ tokens: Array.isArray(magicWord) ? 
magicWord : [magicWord] });
+   return;
+   }
+   } catch (e) {
+   env.log("error", "Exception ", e, " checking magic word 
for token: ", token);
+   }
}
 
-   var text = token.dataAttribs.src;
-   var tgt = this.resolveTemplateTarget(state, token.attribs[0].k);
-   var accumReceiveToksFromSibling;
-   var accumReceiveToksFromChild;
-
-   // console.warn("\ttgt", tgt);
if (this.options.wrapTemplates && tgt === null) {
// Target contains tags, convert template braces and pipes back 
into text
// Re-join attribute tokens with '=' and '|'
this.convertAttribsToString(state, token.attribs, cb);
return;
}
+
+   var accumReceiveToksFromSibling;
+   var accumReceiveToksFromChild;
 
if (env.conf.parsoid.usePHPPreProcessor) {
if (this.options.wrapTemplates) {
@@ -193,15 +192,17 @@
// TokenAccumulator and can return the expansion 
directly
accumReceiveToksFromSibling = cb;
}
+
+   accumReceiveToksFromSibling({tokens: [], async: true});
+
// expand argument keys, with callback set to next processing 
step
// XXX: would likely be faster to do this in a tight loop here
-   var atm = new AttributeTransformManager(
+   atm = new AttributeTransformManager(
this.manager,
{wrapTemplates: false, inTemplate: 
true},
this._expandTemplate.bind(this, state, 
frame, tgt,
accumReceiveToksFromSibling)
);
-   accumReceiveToksFromSibling({tokens: [], async: true});
atm.process(token.attribs);
}
 };
@@ -242,6 +243,7 @@
// 2. String with entities: {{DEFAULTSORT:"foo"bar}}

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: GENDER should be used for "triggered" in AbuseFilter log mes...

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326371 )

Change subject: GENDER should be used for "triggered" in AbuseFilter log 
messages
..


GENDER should be used for "triggered" in AbuseFilter log messages

Bug: T152872
Change-Id: I42ce0d741762e01d34590b334a70d30fceb877ce
---
M i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c168588..ae79806 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,9 +48,9 @@
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
"abusefilter-log-search-submit": "Search",
-   "abusefilter-log-entry": "$1: $2 triggered an abuse filter, 
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter 
description: $6",
-   "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter, 
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter 
description: $6 ($7)",
-   "abusefilter-log-detailedentry-meta": "$1: $2 triggered $3, 
{{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter 
description: $7 ($8)",
+   "abusefilter-log-entry": "$1: $2 {{GENDER:$8|triggered}} an abuse 
filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: 
$5;\nFilter description: $6",
+   "abusefilter-log-entry-withdiff": "$1: $2 {{GENDER:$8|triggered}} an 
abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: 
$5;\nFilter description: $6 ($7)",
+   "abusefilter-log-detailedentry-meta": "$1: $2 {{GENDER:$9|triggered}} 
$3, {{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: 
$6;\nFilter description: $7 ($8)",
"abusefilter-log-detailedentry-global": "global filter $1",
"abusefilter-log-detailedentry-local": "filter $1",
"abusefilter-log-detailslink": "details",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42ce0d741762e01d34590b334a70d30fceb877ce
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Production kubernetes: Specify the service IP range

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329350 )

Change subject: Production kubernetes: Specify the service IP range
..


Production kubernetes: Specify the service IP range

Allow specifying the service IP range in the profile kubernetes class
and set it via hiera

Change-Id: Ic3ce1165c8dee4ba9f6719362efdfb2cd7bba723
---
M hieradata/role/common/kubernetes/master.yaml
M modules/profile/manifests/kubernetes/master.pp
2 files changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/hieradata/role/common/kubernetes/master.yaml 
b/hieradata/role/common/kubernetes/master.yaml
index 2ae50c5..f07f818 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -12,3 +12,4 @@
  - kubernetes1002.eqiad.wmnet
  - kubernetes1003.eqiad.wmnet
  - kubernetes1004.eqiad.wmnet
+profile::kubernetes::master::service_cluster_ip_range: 192.168.30.0/24
diff --git a/modules/profile/manifests/kubernetes/master.pp 
b/modules/profile/manifests/kubernetes/master.pp
index 09132cc..a8e83cb 100644
--- a/modules/profile/manifests/kubernetes/master.pp
+++ b/modules/profile/manifests/kubernetes/master.pp
@@ -2,6 +2,7 @@
 $etcd_urls=hiera('profile::kubernetes::master::etcd_urls'),
 $kubenodes=hiera('profile::kubernetes::master::kubenodes'),
 $docker_registry=hiera('profile::kubernetes::master::docker_registry'),
+
$service_cluster_ip_range=hiera('profile::kubernetes::master::service_cluster_ip_range'),
 ){
 base::expose_puppet_certs { '/etc/kubernetes':
 provide_private => true,
@@ -10,13 +11,14 @@
 }
 $etcd_servers = join($etcd_urls, ',')
 class { '::k8s::apiserver':
-use_package  => true,
-etcd_servers => $etcd_servers,
-docker_registry  => $docker_registry,
-ssl_cert_path=> '/etc/kubernetes/ssl/cert.pem',
-ssl_key_path => '/etc/kubernetes/ssl/server.key',
-ssl_certificate_name => '',
-authz_mode   => '',
+use_package  => true,
+etcd_servers => $etcd_servers,
+docker_registry  => $docker_registry,
+ssl_cert_path=> '/etc/kubernetes/ssl/cert.pem',
+ssl_key_path => '/etc/kubernetes/ssl/server.key',
+ssl_certificate_name => '',
+authz_mode   => '',
+service_cluster_ip_range => $service_cluster_ip_range,
 }
 
 class { '::k8s::scheduler': use_package => true }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes apiserver: Allow specifying > 1 apiserver

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329351 )

Change subject: kubernetes apiserver: Allow specifying > 1 apiserver
..


kubernetes apiserver: Allow specifying > 1 apiserver

Allow specifying the apiserver-count parameter. Default to undef in
order to be backwards compatible with labs, ensuring we don't break it,
and specify it for production where we already got more than one master

Change-Id: I26376e5100bec1607e8b2f97fb706a6a9a99b741
---
M hieradata/role/common/kubernetes/master.yaml
M modules/k8s/manifests/apiserver.pp
M modules/k8s/templates/kube-apiserver.default.erb
M modules/profile/manifests/kubernetes/master.pp
4 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/kubernetes/master.yaml 
b/hieradata/role/common/kubernetes/master.yaml
index f07f818..8ec7608 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -13,3 +13,4 @@
  - kubernetes1003.eqiad.wmnet
  - kubernetes1004.eqiad.wmnet
 profile::kubernetes::master::service_cluster_ip_range: 192.168.30.0/24
+profile::kubernetes::master::apiserver_count: 2
diff --git a/modules/k8s/manifests/apiserver.pp 
b/modules/k8s/manifests/apiserver.pp
index 37679d3..8def3e0 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -21,6 +21,7 @@
 $host_path_prefixes_allowed = [],
 $use_package = false,
 $authz_mode = 'abac',
+$apiserver_count = undef,
 ) {
 include k8s::users
 
diff --git a/modules/k8s/templates/kube-apiserver.default.erb 
b/modules/k8s/templates/kube-apiserver.default.erb
index 2765ebd..da09d83 100644
--- a/modules/k8s/templates/kube-apiserver.default.erb
+++ b/modules/k8s/templates/kube-apiserver.default.erb
@@ -32,6 +32,9 @@
 --authorization-mode=ABAC \
 --authorization-policy-file=/etc/kubernetes/abac \
 <%- end -%>
+<%- if @apiserver_count -%>
+--apiserver-count=<%= @apiserver_count %> \
+<%- end -%>
 --tls-cert-file=<%= @real_ssl_cert_path %> \
 --tls-private-key-file=<%= @real_ssl_key_path %> \
 --enforced-docker-registry=<%= @docker_registry %> \
diff --git a/modules/profile/manifests/kubernetes/master.pp 
b/modules/profile/manifests/kubernetes/master.pp
index a8e83cb..bfc5f56 100644
--- a/modules/profile/manifests/kubernetes/master.pp
+++ b/modules/profile/manifests/kubernetes/master.pp
@@ -3,6 +3,7 @@
 $kubenodes=hiera('profile::kubernetes::master::kubenodes'),
 $docker_registry=hiera('profile::kubernetes::master::docker_registry'),
 
$service_cluster_ip_range=hiera('profile::kubernetes::master::service_cluster_ip_range'),
+$apiserver_count=hiera('profile::kubernetes::master::apiserver_count'),
 ){
 base::expose_puppet_certs { '/etc/kubernetes':
 provide_private => true,
@@ -19,6 +20,7 @@
 ssl_certificate_name => '',
 authz_mode   => '',
 service_cluster_ip_range => $service_cluster_ip_range,
+apiserver_count  => $apiserver_count,
 }
 
 class { '::k8s::scheduler': use_package => true }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26376e5100bec1607e8b2f97fb706a6a9a99b741
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes apiserver: Allow specifying > 1 apiserver

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329351 )

Change subject: kubernetes apiserver: Allow specifying > 1 apiserver
..

kubernetes apiserver: Allow specifying > 1 apiserver

Allow specifying the apiserver-count parameter. Default to undef in
order to be backwards compatible with labs, ensuring we don't break it,
and specify it for production where we already got more than one master

Change-Id: I26376e5100bec1607e8b2f97fb706a6a9a99b741
---
M hieradata/role/common/kubernetes/master.yaml
M modules/k8s/manifests/apiserver.pp
M modules/k8s/templates/kube-apiserver.default.erb
M modules/profile/manifests/kubernetes/master.pp
4 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/329351/1

diff --git a/hieradata/role/common/kubernetes/master.yaml 
b/hieradata/role/common/kubernetes/master.yaml
index f07f818..8ec7608 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -13,3 +13,4 @@
  - kubernetes1003.eqiad.wmnet
  - kubernetes1004.eqiad.wmnet
 profile::kubernetes::master::service_cluster_ip_range: 192.168.30.0/24
+profile::kubernetes::master::apiserver_count: 2
diff --git a/modules/k8s/manifests/apiserver.pp 
b/modules/k8s/manifests/apiserver.pp
index 37679d3..8def3e0 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -21,6 +21,7 @@
 $host_path_prefixes_allowed = [],
 $use_package = false,
 $authz_mode = 'abac',
+$apiserver_count = undef,
 ) {
 include k8s::users
 
diff --git a/modules/k8s/templates/kube-apiserver.default.erb 
b/modules/k8s/templates/kube-apiserver.default.erb
index 2765ebd..da09d83 100644
--- a/modules/k8s/templates/kube-apiserver.default.erb
+++ b/modules/k8s/templates/kube-apiserver.default.erb
@@ -32,6 +32,9 @@
 --authorization-mode=ABAC \
 --authorization-policy-file=/etc/kubernetes/abac \
 <%- end -%>
+<%- if @apiserver_count -%>
+--apiserver-count=<%= @apiserver_count %> \
+<%- end -%>
 --tls-cert-file=<%= @real_ssl_cert_path %> \
 --tls-private-key-file=<%= @real_ssl_key_path %> \
 --enforced-docker-registry=<%= @docker_registry %> \
diff --git a/modules/profile/manifests/kubernetes/master.pp 
b/modules/profile/manifests/kubernetes/master.pp
index a8e83cb..bfc5f56 100644
--- a/modules/profile/manifests/kubernetes/master.pp
+++ b/modules/profile/manifests/kubernetes/master.pp
@@ -3,6 +3,7 @@
 $kubenodes=hiera('profile::kubernetes::master::kubenodes'),
 $docker_registry=hiera('profile::kubernetes::master::docker_registry'),
 
$service_cluster_ip_range=hiera('profile::kubernetes::master::service_cluster_ip_range'),
+$apiserver_count=hiera('profile::kubernetes::master::apiserver_count'),
 ){
 base::expose_puppet_certs { '/etc/kubernetes':
 provide_private => true,
@@ -19,6 +20,7 @@
 ssl_certificate_name => '',
 authz_mode   => '',
 service_cluster_ip_range => $service_cluster_ip_range,
+apiserver_count  => $apiserver_count,
 }
 
 class { '::k8s::scheduler': use_package => true }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26376e5100bec1607e8b2f97fb706a6a9a99b741
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Production kubernetes: Specify the service IP range

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329350 )

Change subject: Production kubernetes: Specify the service IP range
..

Production kubernetes: Specify the service IP range

Allow specifying the service IP range in the profile kubernetes class
and set it via hiera

Change-Id: Ic3ce1165c8dee4ba9f6719362efdfb2cd7bba723
---
M hieradata/role/common/kubernetes/master.yaml
M modules/profile/manifests/kubernetes/master.pp
2 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/329350/1

diff --git a/hieradata/role/common/kubernetes/master.yaml 
b/hieradata/role/common/kubernetes/master.yaml
index 2ae50c5..f07f818 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -12,3 +12,4 @@
  - kubernetes1002.eqiad.wmnet
  - kubernetes1003.eqiad.wmnet
  - kubernetes1004.eqiad.wmnet
+profile::kubernetes::master::service_cluster_ip_range: 192.168.30.0/24
diff --git a/modules/profile/manifests/kubernetes/master.pp 
b/modules/profile/manifests/kubernetes/master.pp
index 09132cc..a8e83cb 100644
--- a/modules/profile/manifests/kubernetes/master.pp
+++ b/modules/profile/manifests/kubernetes/master.pp
@@ -2,6 +2,7 @@
 $etcd_urls=hiera('profile::kubernetes::master::etcd_urls'),
 $kubenodes=hiera('profile::kubernetes::master::kubenodes'),
 $docker_registry=hiera('profile::kubernetes::master::docker_registry'),
+
$service_cluster_ip_range=hiera('profile::kubernetes::master::service_cluster_ip_range'),
 ){
 base::expose_puppet_certs { '/etc/kubernetes':
 provide_private => true,
@@ -10,13 +11,14 @@
 }
 $etcd_servers = join($etcd_urls, ',')
 class { '::k8s::apiserver':
-use_package  => true,
-etcd_servers => $etcd_servers,
-docker_registry  => $docker_registry,
-ssl_cert_path=> '/etc/kubernetes/ssl/cert.pem',
-ssl_key_path => '/etc/kubernetes/ssl/server.key',
-ssl_certificate_name => '',
-authz_mode   => '',
+use_package  => true,
+etcd_servers => $etcd_servers,
+docker_registry  => $docker_registry,
+ssl_cert_path=> '/etc/kubernetes/ssl/cert.pem',
+ssl_key_path => '/etc/kubernetes/ssl/server.key',
+ssl_certificate_name => '',
+authz_mode   => '',
+service_cluster_ip_range => $service_cluster_ip_range,
 }
 
 class { '::k8s::scheduler': use_package => true }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3ce1165c8dee4ba9f6719362efdfb2cd7bba723
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Reduced number of fields for some Special pages and added co...

2016-12-27 Thread Aleksey Bekh-Ivanov (WMDE) (Code Review)

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329349 )

Change subject: Reduced number of fields for some Special pages and added 
constructor DI
..

Reduced number of fields for some Special pages and added constructor DI

  * Removed fields `languageCodes` and `languageNameLookup` form 
`SpecialNewEntity` -  not used anymore
  * Moved field `siteLookup` from `SpecialWikibaseRepoPage` to where it is 
actually being used: `SpecialNewItem` and `SpecialSetSiteLink`
  * `SpecialNewItem` and `SpecialNewProperty` now have constructor DI and 
initialized by closure
  * `SpecialNewEntity` removed optionality form restriction argument in 
constructor, replaced by explicit definition in inheritors

Change-Id: Iefe9510a83cedbafc94fbb356d39c31099475570
Task: T150205
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialModifyEntity.php
M repo/includes/Specials/SpecialNewEntity.php
M repo/includes/Specials/SpecialNewItem.php
M repo/includes/Specials/SpecialNewProperty.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
M repo/includes/Specials/SpecialSetSiteLink.php
M repo/includes/Specials/SpecialWikibaseRepoPage.php
M repo/tests/phpunit/includes/Specials/SpecialNewEntityTest.php
M repo/tests/phpunit/includes/Specials/SpecialNewItemTest.php
M repo/tests/phpunit/includes/Specials/SpecialNewPropertyTest.php
M repo/tests/phpunit/includes/Specials/SpecialSetLabelDescriptionAliasesTest.php
12 files changed, 80 insertions(+), 64 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index f4cb472..40689e7 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -180,8 +180,35 @@
$wgAPIListModules['wbsubscribers'] = 
Wikibase\Repo\Api\ListSubscribers::class;
 
// Special page registration
-   $wgSpecialPages['NewItem'] = 
Wikibase\Repo\Specials\SpecialNewItem::class;
-   $wgSpecialPages['NewProperty'] = 
Wikibase\Repo\Specials\SpecialNewProperty::class;
+   $wgSpecialPages['NewItem'] = function () {
+   $wikibaseRepo = 
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+
+   $settings = $wikibaseRepo->getSettings();
+   $copyrightView = new 
\Wikibase\Repo\Specials\SpecialPageCopyrightView(
+   new \Wikibase\CopyrightMessageBuilder(),
+   $settings->getSetting( 'dataRightsUrl' ),
+   $settings->getSetting( 'dataRightsText' )
+   );
+
+   return new Wikibase\Repo\Specials\SpecialNewItem(
+   $wikibaseRepo->getSiteLookup(),
+   $copyrightView
+   );
+   };
+   $wgSpecialPages['NewProperty'] = function () {
+   $wikibaseRepo = 
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+
+   $settings = $wikibaseRepo->getSettings();
+   $copyrightView = new 
\Wikibase\Repo\Specials\SpecialPageCopyrightView(
+   new \Wikibase\CopyrightMessageBuilder(),
+   $settings->getSetting( 'dataRightsUrl' ),
+   $settings->getSetting( 'dataRightsText' )
+   );
+
+   return new Wikibase\Repo\Specials\SpecialNewProperty(
+   $copyrightView
+   );
+   };
$wgSpecialPages['ItemByTitle'] = 
Wikibase\Repo\Specials\SpecialItemByTitle::class;
$wgSpecialPages['GoToLinkedPage'] = 
Wikibase\Repo\Specials\SpecialGoToLinkedPage::class;
$wgSpecialPages['ItemDisambiguation'] = 
Wikibase\Repo\Specials\SpecialItemDisambiguation::class;
diff --git a/repo/includes/Specials/SpecialModifyEntity.php 
b/repo/includes/Specials/SpecialModifyEntity.php
index 1f894be..d4e5496 100644
--- a/repo/includes/Specials/SpecialModifyEntity.php
+++ b/repo/includes/Specials/SpecialModifyEntity.php
@@ -74,7 +74,6 @@
$wikibaseRepo->getSummaryFormatter(),
$wikibaseRepo->getEntityRevisionLookup( 'uncached' ),
$wikibaseRepo->getEntityTitleLookup(),
-   $wikibaseRepo->getSiteLookup(),
$wikibaseRepo->newEditEntityFactory( 
$this->getContext() )
);
}
@@ -92,14 +91,12 @@
SummaryFormatter $summaryFormatter,
EntityRevisionLookup $entityRevisionLookup,
EntityTitleLookup $entityTitleLookup,
-   SiteLookup $siteLookup,
EditEntityFactory $editEntityFactory
) {
$this->entityRevisionLookup = $entityRevisionLookup;
$this->setSpecialWikibaseRepoPageServices(
$summaryFormatter,
$entityTitleLookup,
-   $siteLookup,
$editEntityFactory

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Filter out nodes completely sanitized away by DOMPurify

2016-12-27 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329348 )

Change subject: Filter out nodes completely sanitized away by DOMPurify
..

Filter out nodes completely sanitized away by DOMPurify

Change-Id: Idc90e8693e616aab1fd9b960bfbb421e9af12e45
---
M src/dm/ve.dm.Change.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/48/329348/1

diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index f9f4730..3f00f7f 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -160,6 +160,9 @@
} else {
return fragmentOrHtml.childNodes[ 0 ];
}
+   } ).filter( function ( node ) {
+   // Nodes can be sanitized to nothing
+   return node !== undefined && node !== '';
} );
} else if ( serialized.type === 'plain' ) {
return serialized.value;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc90e8693e616aab1fd9b960bfbb421e9af12e45
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Add /run/docker/netns/ as well in ignored disk c...

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329347 )

Change subject: kubernetes: Add /run/docker/netns/ as well in ignored disk 
checks
..


kubernetes: Add /run/docker/netns/ as well in ignored disk checks

Also ignore /run/docker/netns/ directories

Change-Id: I13bd9f82066420c874a41d755b8d0e18e39be319
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 4e51ae4..05b98d3 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -10,4 +10,4 @@
 profile::docker::engine::settings:
iptables: false
ip-masq: false
-base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* --exclude-type=tracefs
+base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* -i /run/docker/netns/* --exclude-type=tracefs

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Fix the height of the upload container & child element

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329318 )

Change subject: Fix the height of the upload container & child element
..


Fix the height of the upload container & child element

Bug: T154173
Change-Id: Icce18c8e3588b4045eb9eefbd667171da7a35ad0
---
M Poll.css
M create-poll.tmpl.php
2 files changed, 13 insertions(+), 7 deletions(-)

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



diff --git a/Poll.css b/Poll.css
index 4479f7a..dacd77c 100644
--- a/Poll.css
+++ b/Poll.css
@@ -71,10 +71,16 @@
width: 250px;
 }
 
-/* Width of the image upload frame on Special:CreatePoll. If you alter this,
- * remember to change the height of #real-form in create-poll.tmpl.php, too! */
+/* Width of the image upload frame on Special:CreatePoll */
+#real-form {
+   display: block;
+   height: auto;
+}
+
 .imageUpload-frame {
-   height: 90px;
+   border: 0;
+   width: 610px;
+   overflow: hidden;
 }
 
 /* Poll Window */
@@ -587,4 +593,4 @@
 /* No borders around the various images we use */
 .poll, .poll-right img {
border: 0;
-}
\ No newline at end of file
+}
diff --git a/create-poll.tmpl.php b/create-poll.tmpl.php
index 2cd481d..7fa268d 100644
--- a/create-poll.tmpl.php
+++ b/create-poll.tmpl.php
@@ -55,8 +55,8 @@
msg( 'poll-image-label' )->text() 
?>

 
-   
-   
+   
+   


 
@@ -66,4 +66,4 @@

 https://gerrit.wikimedia.org/r/329318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icce18c8e3588b4045eb9eefbd667171da7a35ad0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Add /run/docker/netns/ as well in ignored disk c...

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329347 )

Change subject: kubernetes: Add /run/docker/netns/ as well in ignored disk 
checks
..

kubernetes: Add /run/docker/netns/ as well in ignored disk checks

Also ignore /run/docker/netns/ directories

Change-Id: I13bd9f82066420c874a41d755b8d0e18e39be319
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/329347/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 4e51ae4..05b98d3 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -10,4 +10,4 @@
 profile::docker::engine::settings:
iptables: false
ip-masq: false
-base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* --exclude-type=tracefs
+base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* -i /run/docker/netns/* --exclude-type=tracefs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13bd9f82066420c874a41d755b8d0e18e39be319
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Specify correctly the docker version

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329346 )

Change subject: kubernetes: Specify correctly the docker version
..


kubernetes: Specify correctly the docker version

Forgot the "debian" string in a previous commit

Change-Id: I9ba612e853d4076aa73b72522f5338490cf7b835
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 3b0a8f2..4e51ae4 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -3,7 +3,7 @@
 value: standard
 cluster: kubernetes
 profile::docker::storage::physical_volumes: "/dev/md2"
-profile::docker::engine::version: "1.12.5-0~jessie"
+profile::docker::engine::version: "1.12.5-0~debian-jessie"
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ba612e853d4076aa73b72522f5338490cf7b835
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::kubernetes::worker: tweak disk checks

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329345 )

Change subject: role::kubernetes::worker: tweak disk checks
..


role::kubernetes::worker: tweak disk checks

Specifically, do not look down the /var/lib/docker/containers space

Change-Id: Ib40e09d3bc430f735353b183a19c077f9a33aaaf
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index a14a2ad..3b0a8f2 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -10,3 +10,4 @@
 profile::docker::engine::settings:
iptables: false
ip-masq: false
+base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* --exclude-type=tracefs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib40e09d3bc430f735353b183a19c077f9a33aaaf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Specify correctly the docker version

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329346 )

Change subject: kubernetes: Specify correctly the docker version
..

kubernetes: Specify correctly the docker version

Forgot the "debian" string in a previous commit

Change-Id: I9ba612e853d4076aa73b72522f5338490cf7b835
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/329346/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index a14a2ad..04034bc 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -3,7 +3,7 @@
 value: standard
 cluster: kubernetes
 profile::docker::storage::physical_volumes: "/dev/md2"
-profile::docker::engine::version: "1.12.5-0~jessie"
+profile::docker::engine::version: "1.12.5-0~debian-jessie"
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ba612e853d4076aa73b72522f5338490cf7b835
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::kubernetes::worker: tweak disk checks

2016-12-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329345 )

Change subject: role::kubernetes::worker: tweak disk checks
..

role::kubernetes::worker: tweak disk checks

Specifically, do not look down the /var/lib/docker/containers space

Change-Id: Ib40e09d3bc430f735353b183a19c077f9a33aaaf
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/329345/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 1c7ccfc..11d895a 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -10,3 +10,4 @@
 profile::docker::engine::settings:
iptables: false
ip-masq: false
+base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i 
/var/lib/docker/containers/* --exclude-type=tracefs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib40e09d3bc430f735353b183a19c077f9a33aaaf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes::worker: Bump docker-engine version

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329344 )

Change subject: kubernetes::worker: Bump docker-engine version
..

kubernetes::worker: Bump docker-engine version

We now have 1.12.5 in our repos, bump the version in hiera

Change-Id: I7766d05066125c98ca127df55b98ded5ea5be0c0
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/329344/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 1c7ccfc..a14a2ad 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -3,7 +3,7 @@
 value: standard
 cluster: kubernetes
 profile::docker::storage::physical_volumes: "/dev/md2"
-profile::docker::engine::version: "1.12.2-0~jessie"
+profile::docker::engine::version: "1.12.5-0~jessie"
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7766d05066125c98ca127df55b98ded5ea5be0c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes::worker: Bump docker-engine version

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329344 )

Change subject: kubernetes::worker: Bump docker-engine version
..


kubernetes::worker: Bump docker-engine version

We now have 1.12.5 in our repos, bump the version in hiera

Change-Id: I7766d05066125c98ca127df55b98ded5ea5be0c0
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 1c7ccfc..a14a2ad 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -3,7 +3,7 @@
 value: standard
 cluster: kubernetes
 profile::docker::storage::physical_volumes: "/dev/md2"
-profile::docker::engine::version: "1.12.2-0~jessie"
+profile::docker::engine::version: "1.12.5-0~jessie"
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix typo in abusefilter-edit-builder-vars-user-age

2016-12-27 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329343 )

Change subject: Fix typo in abusefilter-edit-builder-vars-user-age
..

Fix typo in abusefilter-edit-builder-vars-user-age

Change-Id: I8ac030d5e620d4d6061c7360d61a5fe6c817e13c
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/43/329343/2

diff --git a/i18n/en.json b/i18n/en.json
index 0b8c9a8..b4440cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -263,7 +263,7 @@
"abusefilter-edit-builder-vars-movedto-text": "Title of move 
destination page",
"abusefilter-edit-builder-vars-movedto-prefixedtext": "Full title of 
move destination page",
"abusefilter-edit-builder-vars-user-editcount": "Edit count of the 
user",
-   "abusefilter-edit-builder-vars-user-age": "Age of user the account",
+   "abusefilter-edit-builder-vars-user-age": "Age of the user account",
"abusefilter-edit-builder-vars-user-name": "Name of the user account",
"abusefilter-edit-builder-vars-user-groups": "Groups (including 
implicit) the user is in",
"abusefilter-edit-builder-vars-user-rights": "Rights that the user has",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ac030d5e620d4d6061c7360d61a5fe6c817e13c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Cache global filter names

2016-12-27 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329213 )

Change subject: Cache global filter names
..

Cache global filter names

AbuseLog fetches the names in an additional query for each line but the
result is always same.

Change-Id: Ie12f909727ae82ab60781ccedfdf1b241c105388
---
M includes/AbuseFilter.class.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/13/329213/2

diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 3cc456b..649fa05 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2407,14 +2407,21 @@
return '';
}
 
+   static $cache = array();
+   if ( isset( $cache[$filterID] ) ) {
+   return $cache[$filterID];
+   }
+
$fdb = wfGetDB( DB_SLAVE, array(), $wgAbuseFilterCentralDB );
 
-   return $fdb->selectField(
+   $cache[$filterID] = $fdb->selectField(
'abuse_filter',
'af_public_comments',
array( 'af_id' => $filterID ),
__METHOD__
);
+
+   return $cache[$filterID];
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie12f909727ae82ab60781ccedfdf1b241c105388
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Rewrite claimit.py

2016-12-27 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329050 )

Change subject: Rewrite claimit.py
..

Rewrite claimit.py

Fix -exists argument, replace exception with an error message, use
Claim.target_equals().

There's already a patch at I4c1c0b8b7 which has been stale for two
years, so I went ahead and tried not to make greater changes.

Bug: T69284
Change-Id: I1c3d13d51ca9f409173f046e5ac8ec4604b34917
---
M scripts/claimit.py
1 file changed, 63 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/50/329050/2

diff --git a/scripts/claimit.py b/scripts/claimit.py
index cd2993c..1b57be5 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -35,12 +35,12 @@
 
 Suppose the claim you want to add has the same property as an existing claim
 and the "-exists:p" argument is used. Now, claimit.py will not add the claim
-if it has the same target, sources, and/or qualifiers as the existing claim.
+if it has the same target, source, and/or the existing claim has qualifiers.
 To override this behavior, add 't' (target), 's' (sources), or 'q' (qualifiers)
 to the 'exists' argument.
 
 For instance, to add the claim to each page even if one with the same
-property, target, and qualifiers already exists:
+property and target and some qualifiers already exists:
 
 python pwb.py claimit [pagegenerators] P246 "string example" -exists:ptq
 
@@ -50,7 +50,7 @@
 """
 #
 # (C) Legoktm, 2013
-# (C) Pywikibot team, 2013-2014
+# (C) Pywikibot team, 2013-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -86,7 +86,7 @@
 super(ClaimRobot, self).__init__(use_from_page=None)
 self.generator = generator
 self.claims = claims
-self.exists_arg = exists_arg
+self.exists_arg = ''.join(x for x in exists_arg.lower() if x in 'pqst')
 self.cacheSources()
 if self.exists_arg:
 pywikibot.output('\'exists\' argument set to \'%s\'' % 
self.exists_arg)
@@ -94,79 +94,63 @@
 def treat(self, page, item):
 """Treat each page."""
 self.current_page = page
+# The generator might yield pages from multiple sites
+source = self.getSource(page.site)
 
-if item:
-for claim in self.claims:
-skip = False
+for claim in self.claims:
+# Existing claims on page of same property
+for existing in item.claims.get(claim.getID(), []):
 # If claim with same property already exists...
-if claim.getID() in item.claims:
-if self.exists_arg is None or 'p' not in self.exists_arg:
-pywikibot.log(
-'Skipping %s because claim with same property '
-'already exists' % (claim.getID(),))
-pywikibot.log(
-'Use -exists:p option to override this behavior')
-skip = True
-else:
-# Existing claims on page of same property
-existing_claims = item.claims[claim.getID()]
-for existing in existing_claims:
-skip = True  # Default value
-# If some attribute of the claim being added
-# matches some attribute in an existing claim of
-# the same property, skip the claim, unless the
-# 'exists' argument overrides it.
-if (claim.getTarget() == existing.getTarget() and
-'t' not in self.exists_arg):
-pywikibot.log(
-'Skipping %s because claim with same 
target already exists'
-% (claim.getID(),))
-pywikibot.log(
-'Append \'t\' to -exists argument to 
override this behavior')
-break
-if (listsEqual(claim.getSources(), 
existing.getSources()) and
-'s' not in self.exists_arg):
-pywikibot.log(
-'Skipping %s because claim with same 
sources already exists'
-% (claim.getID(),))
-pywikibot.log(
-'Append \'s\' to -exists argument to 
override this behavior')
-break
-if (listsEqual(claim.qualifiers, 
existing.qualifiers) and
-'q' not in self.exists_arg):
-pywikibot.log(
-

[MediaWiki-commits] [Gerrit] mediawiki...DPLforum[master]: Replaced deprecated "Linker::link"

2016-12-27 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329342 )

Change subject: Replaced deprecated "Linker::link"
..

Replaced deprecated "Linker::link"

Bug: T149346
Change-Id: I6f66d48387dccdc34cf3df579eac3a473c660042
---
M DPLforum_body.php
1 file changed, 12 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DPLforum 
refs/changes/42/329342/1

diff --git a/DPLforum_body.php b/DPLforum_body.php
index 78a9ef6..96df7d4 100644
--- a/DPLforum_body.php
+++ b/DPLforum_body.php
@@ -25,6 +25,8 @@
  * @ingroup Extensions
  */
 
+ use MediaWiki\MediaWikiServices;
+
 if ( !defined( 'MEDIAWIKI' ) ) {
echo( "This file is an extension to the MediaWiki software and is not a 
valid access point" );
die( 1 );
@@ -464,7 +466,7 @@
function buildOutput( $page, $title, $time, $user = '', $author = '', 
$made = '' ) {
$tableMode =& $this->bTableMode;
$output = '';
-
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
if ( $this->bAddCreationDate ) {
if ( is_numeric( $made ) ) {
$made = $this->date( $made, 'date', 
$this->sCreationDateFormat );
@@ -472,10 +474,10 @@
 
if ( $page && $this->bLinkHistory && 
!$this->bAddLastEdit ) {
if ( $this->bEmbedHistory ) {
-   $made = Linker::link( $page, $made, 
array(), array( 'action' => 'history' ), array( 'known' ) );
+   $made = $linkRenderer->makeLink( $page, 
$made, array(), array( 'action' => 'history' ), array( 'known' ) );
} else {
-   $made .= ' (' . Linker::link( $page,
-   wfMessage( 'hist' )->escaped(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
+   $made .= ' (' . 
$linkRenderer->makeLink( $page,
+   wfMessage( 'hist' )->text(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
}
}
 
@@ -511,14 +513,14 @@
}
}
 
-   $output .= Linker::link( $title, $text, $props, $query, array( 
'known' ) );
+   $output .= $linkRenderer->makeLink( $title, $text, $props, 
$query, array( 'known' ) );
$text = '';
 
if ( $this->bAddAuthor ) {
$author = Title::newFromText( $author, NS_USER );
 
if ( $author ) {
-   $author = Linker::link( $author, 
$author->getText(), array(), array(), array( 'known' ) );
+   $author = $linkRenderer->makeLink( $author, 
$author->getText(), array(), array(), array( 'known' ) );
}
 
if ( $tableMode ) {
@@ -545,10 +547,10 @@
 
if ( $page && $this->bLinkHistory ) {
if ( $this->bEmbedHistory ) {
-   $time = Linker::link( $page, $time, 
array(), array( 'action' => 'history' ), array( 'known' ) );
+   $time = $linkRenderer->makeLink( $page, 
$time, array(), array( 'action' => 'history' ), array( 'known' ) );
} else {
-   $time .= ' (' . Linker::link( $page,
-   wfMessage( 'hist' )->escaped(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
+   $time .= ' (' . 
$linkRenderer->makeLink( $page,
+   wfMessage( 'hist' )->text(), 
array(), array( 'action' => 'history' ), array( 'known' ) ) . ')';
}
}
 
@@ -563,7 +565,7 @@
$user = Title::newFromText( $user, NS_USER );
 
if ( $user ) {
-   $user = Linker::link( $user, $user->getText(), 
array(), array(), array( 'known' ) );
+   $user = $linkRenderer->makeLink( $user, 
$user->getText(), array(), array(), array( 'known' ) );
}
 
if ( $tableMode ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f66d48387dccdc34cf3df579eac3a473c660042
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DPLforum
Gerrit-Branch: master
Gerrit-Owner: Filip 

___

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::horizon::service: use require_package for keyston...

2016-12-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329339 )

Change subject: openstack::horizon::service: use require_package for 
keystoneclient
..


openstack::horizon::service: use require_package for keystoneclient

Solves a case of duplicate declaration; it also solves a dependency
without need for setting it explicitly in our code.

Change-Id: I3fedf27aba4aeedb6fb1b763f1852632b0f0e308
---
M modules/openstack/manifests/horizon/service.pp
1 file changed, 12 insertions(+), 13 deletions(-)

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



diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index 2702153..ffd5a7b 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -1,4 +1,4 @@
-# The OpenStack Dashboard Project
+# The OpenStack Das2hboard Project
 # http://docs.openstack.org/developer/horizon/
 class openstack::horizon::service(
 $novaconfig,
@@ -14,8 +14,9 @@
 require => Class['openstack::repo',  '::apache::mod::wsgi'];
 }
 
-package { [ 'python-keystoneclient',
-'python-openstack-auth',
+require_package('python-keystoneclient')
+
+package { [ 'python-openstack-auth',
 'python-designate-dashboard' ]:
 ensure  => present,
 }
@@ -111,18 +112,16 @@
 
 # Homemade totp plugin for keystoneclient
 file { 
'/usr/lib/python2.7/dist-packages/keystoneclient/auth/identity/v3/wmtotp.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/wmtotp.py",
-owner   => 'root',
-group   => 'root',
-require => Package['python-keystoneclient'],
-mode=> '0644',
+source => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/wmtotp.py",
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
 }
 file { 
'/usr/lib/python2.7/dist-packages/keystoneclient/auth/identity/v3/__init__.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/__init__.py",
-owner   => 'root',
-group   => 'root',
-require => Package['python-keystoneclient'],
-mode=> '0644',
+source => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/__init__.py",
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
 }
 
 # Homemade totp plugin for openstack_auth

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fedf27aba4aeedb6fb1b763f1852632b0f0e308
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-27T10:00:01+0000

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329325 )

Change subject: New Wikidata Build - 2016-12-27T10:00:01+
..


New Wikidata Build - 2016-12-27T10:00:01+

Change-Id: I9721a8d100ff912604b38a6f6d2ab35b857a596d
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/nl.json
M extensions/Wikibase/client/i18n/da.json
M extensions/Wikibase/client/i18n/diq.json
M extensions/Wikibase/client/i18n/hif-latn.json
A extensions/Wikibase/lib/i18n/hif-latn.json
M extensions/Wikibase/lib/i18n/hr.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/hif-latn.json
M extensions/Wikibase/repo/i18n/lb.json
A extensions/Wikibase/repo/i18n/lez.json
M extensions/Wikibase/repo/i18n/qqq.json
M vendor/composer/installed.json
13 files changed, 68 insertions(+), 31 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 46e214b..90e6a18 100644
--- a/composer.lock
+++ b/composer.lock
@@ -797,12 +797,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162"
+"reference": "c3eb0e8a7f37b4c1209c0da26291d832510d703c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/8f6aad4613af7e8cf359a88decfdb6d3b32c7162;,
-"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/c3eb0e8a7f37b4c1209c0da26291d832510d703c;,
+"reference": "c3eb0e8a7f37b4c1209c0da26291d832510d703c",
 "shasum": ""
 },
 "require-dev": {
@@ -827,7 +827,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-12-25 21:14:56"
+"time": "2016-12-26 21:34:35"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8"
+"reference": "aeabf1549b026c49fdd872c1b066bd764357aa5b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b9466b234af2698627c5595a3ec979c3ed7c9bc8;,
-"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/aeabf1549b026c49fdd872c1b066bd764357aa5b;,
+"reference": "aeabf1549b026c49fdd872c1b066bd764357aa5b",
 "shasum": ""
 },
 "require": {
@@ -1663,7 +1663,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-25 21:20:56"
+"time": "2016-12-26 21:42:40"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/i18n/nl.json 
b/extensions/ArticlePlaceholder/i18n/nl.json
index ea8bf8a..14dee9f 100644
--- a/extensions/ArticlePlaceholder/i18n/nl.json
+++ b/extensions/ArticlePlaceholder/i18n/nl.json
@@ -5,5 +5,6 @@
]
},
"articleplaceholder-abouttopic": "Over het onderwerp",
+   "articleplaceholder-abouttopic-create-emtpy-article-button": "Start een 
nieuw artikel",
"articleplaceholder-abouttopic-lua-entity": "Entiteit"
 }
diff --git a/extensions/Wikibase/client/i18n/da.json 
b/extensions/Wikibase/client/i18n/da.json
index 096bc2e..11ea4b4 100644
--- a/extensions/Wikibase/client/i18n/da.json
+++ b/extensions/Wikibase/client/i18n/da.json
@@ -16,11 +16,11 @@
"tooltip-t-wikibase": "Link til tilknyttet emne i Wikidata",
"wikibase-after-page-move": "Du kan også [$1 opdatere] det tilknyttede 
Wikidata-emne for at bevare sproghenvisninger på den flyttede side.",
"wikibase-after-page-move-queued": "[$1 Wikidataemnet] tilknyttet denne 
side vil snart blive opdateret automatisk.",
-   "wikibase-comment-add": "Et Wikidata-emne er blevet oprettet.",
-   "wikibase-comment-remove": "Det tilknyttede Wikidata-emne er slettet. 
Sproghenvisninger er fjernet.",
-   "wikibase-comment-linked": "Et Wikidata-emne er blevet knyttet til 
denne side.",

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid use of &$this in hooks

2016-12-27 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329341 )

Change subject: Avoid use of &$this in hooks
..

Avoid use of &$this in hooks

* This triggers warnings in PHP 7.1

Bug: T153505
Change-Id: I5324a6bfe9e8ed255975104c5de7e7a7011cb741
---
M includes/EditPage.php
1 file changed, 20 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/329341/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1f871e1..c11df5d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2602,7 +2602,9 @@
$previewOutput = $this->getPreviewText();
}
 
-   Hooks::run( 'EditPage::showEditForm:initial', [ &$this, &$wgOut 
] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPage::showEditForm:initial', [ &$editPage, 
&$wgOut ] );
 
$this->setHeaders();
 
@@ -2679,7 +2681,9 @@
. Xml::closeElement( 'div' )
);
 
-   Hooks::run( 'EditPage::showEditForm:fields', [ &$this, &$wgOut 
] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPage::showEditForm:fields', [ &$editPage, 
&$wgOut ] );
 
// Put these up at the top to ensure they aren't lost on early 
form submission
$this->showFormBeforeText();
@@ -3541,7 +3545,9 @@
protected function showConflict() {
global $wgOut;
 
-   if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, 
&$wgOut ] ) ) {
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$editPage, 
&$wgOut ] ) ) {
$stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
$stats->increment( 'edit.failures.conflict' );
// Only include 'standard' namespaces to avoid creating 
unknown numbers of statsd metrics
@@ -4069,7 +4075,10 @@
$checkboxes['watch'] = $watchThisHtml;
}
}
-   Hooks::run( 'EditPageBeforeEditChecks', [ &$this, &$checkboxes, 
&$tabindex ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageBeforeEditChecks', [ &$editPage, 
&$checkboxes, &$tabindex ] );
return $checkboxes;
}
 
@@ -4118,7 +4127,9 @@
$buttons['diff'] = Html::submitButton( $this->context->msg( 
'showdiff' )->text(),
$attribs );
 
-   Hooks::run( 'EditPageBeforeEditButtons', [ &$this, &$buttons, 
&$tabindex ] );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageBeforeEditButtons', [ &$editPage, 
&$buttons, &$tabindex ] );
return $buttons;
}
 
@@ -4132,7 +4143,10 @@
$wgOut->prepareErrorPage( $this->context->msg( 
'nosuchsectiontitle' ) );
 
$res = $this->context->msg( 'nosuchsectiontext', $this->section 
)->parseAsBlock();
-   Hooks::run( 'EditPageNoSuchSection', [ &$this, &$res ] );
+
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $editPage = $this;
+   Hooks::run( 'EditPageNoSuchSection', [ &$editPage, &$res ] );
$wgOut->addHTML( $res );
 
$wgOut->returnToMain( false, $this->mTitle );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add username filter to action=history

2016-12-27 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329340 )

Change subject: Add username filter to action=history
..

Add username filter to action=history

Allow action=history to be filtered by user name. Using the user id on
existing users and user name on ips/non existing users. Must extra
filter on rev_deleted to exclude revision deleted entries.

It uses the same where condition as api with prop=revisions=

Bug: T12788
Change-Id: Iaa44f28477bf3d3d0458194c6962e5d82389e630
---
M includes/actions/HistoryAction.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 42 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/329340/1

diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index 767a163..995190f 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -95,6 +95,7 @@
function onView() {
$out = $this->getOutput();
$request = $this->getRequest();
+   $user = $this->getUser();
 
/**
 * Allow client caching.
@@ -169,6 +170,7 @@
$month = $request->getInt( 'month' );
$tagFilter = $request->getVal( 'tagfilter' );
$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter, 
false, $this->getContext() );
+   $filterUsername = $request->getVal( 'user' );
 
/**
 * Option to show only revisions that have been (partially) 
hidden via RevisionDelete
@@ -178,12 +180,34 @@
} else {
$conds = [];
}
-   if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
+   if ( $user->isAllowed( 'deletedhistory' ) ) {
$checkDeleted = Xml::checkLabel( $this->msg( 
'history-show-deleted' )->text(),
'deleted', 'mw-show-deleted-only', 
$request->getBool( 'deleted' ) ) . "\n";
} else {
$checkDeleted = '';
}
+   // Check username input validity and build condition
+   $filterUserTitle = Title::makeTitleSafe( NS_USER, 
$filterUsername );
+   if ( $filterUserTitle ) {
+   $filterUsername = $filterUserTitle->getText();
+   $filterUserid = User::idFromName( $filterUsername );
+   if ( !$filterUserid ) {
+   $conds['rev_user_text'] = IP::sanitizeIP( 
$filterUsername );
+   } else {
+   $conds['rev_user'] = $filterUserid;
+   }
+   // Do not find revision deleted entries matching the 
user name,
+   // when the viewing user should not see it
+   $dbr = wfGetDB( DB_REPLICA );
+   if ( !$user->isAllowed( 'deletedhistory' ) ) {
+   $conds[] = $dbr->bitAnd( 'rev_deleted', 
Revision::DELETED_USER ) . ' = 0';
+   } elseif ( !$user->isAllowedAny( 'suppressrevision', 
'viewsuppressed' ) ) {
+   $conds[] = $dbr->bitAnd( 'rev_deleted', 
Revision::SUPPRESSED_USER ) .
+   ' != ' . Revision::SUPPRESSED_USER;
+   }
+   }
+
+   $out->addModules( 'mediawiki.userSuggest' );
 
// Add the general form
$action = htmlspecialchars( wfScript() );
@@ -196,6 +220,21 @@
) .
Html::hidden( 'title', 
$this->getTitle()->getPrefixedDBkey() ) . "\n" .
Html::hidden( 'action', 'history' ) . "\n" .
+   Html::label( $this->msg( 'history-user-search' ), 
'mw-history-user-search' ) . '' .
+   Html::input(
+   'user',
+   $filterUsername,
+   'text',
+   [
+   'id' => 'mw-history-user-search',
+   'size' => '40',
+   'class' => [
+   'mw-input',
+   'mw-ui-input-inline',
+   'mw-autocomplete-user', // used 
by mediawiki.userSuggest
+   ],
+   ]
+   ) . "\n" .
Xml::dateMenu(
( $year == null ? 
MWTimestamp::getLocalInstance()->format( 'Y' ) : $year ),
$month
diff --git a/languages/i18n/en.json

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Remove unnecessary constructor

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329204 )

Change subject: Remove unnecessary constructor
..


Remove unnecessary constructor

It just calls the parent.

Change-Id: I65e1d945d3ffcc6bb312ae315d76461109e81e2d
---
M includes/TwoColConflictPage.php
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 6b83053..759102a 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -7,15 +7,6 @@
 class TwoColConflictPage extends EditPage {
 
/**
-* TwoColConflictPage constructor.
-*
-* @param Article $article
-*/
-   public function __construct( Article $article ) {
-   parent::__construct( $article );
-   }
-
-   /**
 * Replace default header for explaining the conflict screen.
 *
 * @param OutputPage $out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65e1d945d3ffcc6bb312ae315d76461109e81e2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Avoid using global objects

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329203 )

Change subject: Avoid using global objects
..


Avoid using global objects

Replace $wgUser/$wgOut with $this->context->getUser/getOutput().

And don't bother checking whether the ResourceLoader module was
registered since if it wasn't registered, the whole extension wouldn't
be loaded and this code won't run.

Change-Id: I205a31b66a8960461e0de316f538f2087de5c5f6
---
M includes/TwoColConflictPage.php
1 file changed, 13 insertions(+), 19 deletions(-)

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



diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index eee5a86..6b83053 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -21,17 +21,17 @@
 * @param OutputPage $out
 */
protected function addExplainConflictHeader( OutputPage $out ) {
-   $labelAsPublish = 
$this->mArticle->getContext()->getConfig()->get(
+   $labelAsPublish = $this->context->getConfig()->get(
'EditSubmitButtonLabelPublish'
);
 
-   $buttonLabel = $this->getContext()->msg(
+   $buttonLabel = $this->context->msg(
$labelAsPublish ? 'publishchanges' : 'savechanges'
)->text();
 
$out->wrapWikiMsg(
"\n$1\n",
-   $this->getContext()->msg( 
'twoColConflict-explainconflict', $buttonLabel )
+   $this->context->msg( 'twoColConflict-explainconflict', 
$buttonLabel )
);
}
 
@@ -82,7 +82,7 @@
 * @return string
 */
private function buildConflictPageChangesCol() {
-   global $wgUser;
+   $currentUser = $this->context->getUser();
 
$lastUser =
'' .
@@ -90,11 +90,11 @@
'';
$lastChangeTime = 
$this->getContext()->getLanguage()->userTimeAndDate(
$this->getArticle()->getPage()->getTimestamp(),
-   $wgUser
+   $currentUser
);
$yourChangeTime = 
$this->getContext()->getLanguage()->userTimeAndDate(
time(),
-   $wgUser
+   $currentUser
);
 
$out = '';
@@ -114,8 +114,6 @@
 * @return string
 */
private function buildChangesTextbox() {
-   global $wgUser;
-
$name = 'mw-twocolconflict-changes-editor';
$wikitext = $this->safeUnicodeOutput( 
$this->getUnifiedDiffText() );
$wikitext = $this->addNewLineAtEnd( $wikitext );
@@ -127,7 +125,7 @@
$customAttribs[ 'class' ] = 
'mw-twocolconflict-wikieditor';
}
 
-   $attribs = $this->buildTextboxAttribs( $name, $customAttribs, 
$wgUser );
+   $attribs = $this->buildTextboxAttribs( $name, $customAttribs, 
$this->context->getUser() );
 
return Html::rawElement( 'div', $attribs, $wikitext );
}
@@ -138,11 +136,11 @@
 * @return string
 */
private function buildConflictPageEditorCol() {
-   global $wgUser;
-
$lastUser = $this->getArticle()->getPage()->getUserText();
$lastChangeTime = 
$this->getArticle()->getPage()->getTimestamp();
-   $lastChangeTime = 
$this->getContext()->getLanguage()->userTimeAndDate( $lastChangeTime, $wgUser );
+   $lastChangeTime = 
$this->context->getLanguage()->userTimeAndDate(
+   $lastChangeTime, $this->context->getUser()
+   );
 
$out = '';
$out.= '' . $this->getContext()->msg( 
'twoColConflict-editor-col-title' ) . '';
@@ -194,7 +192,7 @@
$output[] = '' .
'' .
'' . // used by IE9
'' .
'';
@@ -204,7 +202,7 @@
$output[] = '' .
'' .
'https://gerrit.wikimedia.org/r/329203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I205a31b66a8960461e0de316f538f2087de5c5f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Don't mess around with $wgHooks by using CustomEditor hook

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329202 )

Change subject: Don't mess around with $wgHooks by using CustomEditor hook
..


Don't mess around with $wgHooks by using CustomEditor hook

The AlternateEdit hook would cause recursion, so it needed to be unset
by messing with $wgHooks.

Instead of doing that, just use the earlier CustomEditor hook that would
only get called once.

Change-Id: Ib1c08a2df3e43db429797647f314af8dbfe58f03
---
M TwoColConflict.hooks.php
M extension.json
2 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/TwoColConflict.hooks.php b/TwoColConflict.hooks.php
index 3034a0c..a4d718b 100644
--- a/TwoColConflict.hooks.php
+++ b/TwoColConflict.hooks.php
@@ -12,8 +12,7 @@
 
 class TwoColConflictHooks {
 
-   public static function onAlternateEdit( EditPage $editPage ) {
-   global $wgHooks;
+   public static function onCustomEditor( Article $article, User $user ) {
$config = MediaWikiServices::getInstance()->getMainConfig();
 
/**
@@ -23,15 +22,12 @@
if (
$config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
-   !BetaFeatures::isFeatureEnabled( 
$editPage->getContext()->getUser(), 'twocolconflict' )
+   !BetaFeatures::isFeatureEnabled( $user, 
'twocolconflict' )
) {
return true;
}
 
-   $key = array_search( 'TwoColConflictHooks::onAlternateEdit', 
$wgHooks );
-   unset( $wgHooks[ 'AlternateEdit' ][ $key ] );
-
-   $twoColConflictPage = new TwoColConflictPage( 
$editPage->mArticle );
+   $twoColConflictPage = new TwoColConflictPage( $article );
$twoColConflictPage->edit();
 
return false;
diff --git a/extension.json b/extension.json
index 4f23592..7651819 100644
--- a/extension.json
+++ b/extension.json
@@ -21,8 +21,8 @@
"GetBetaFeaturePreferences": [
"TwoColConflictHooks::getBetaFeaturePreferences"
],
-   "AlternateEdit": [
-   "TwoColConflictHooks::onAlternateEdit"
+   "CustomEditor": [
+   "TwoColConflictHooks::onCustomEditor"
]
},
"MessagesDirs": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c08a2df3e43db429797647f314af8dbfe58f03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::horizon::service: use require_package for keyston...

2016-12-27 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329339 )

Change subject: openstack::horizon::service: use require_package for 
keystoneclient
..

openstack::horizon::service: use require_package for keystoneclient

Solves a case of duplicate declaration; it also solves a dependency
without need for setting it explicitly in our code.

Change-Id: I3fedf27aba4aeedb6fb1b763f1852632b0f0e308
---
M modules/openstack/manifests/horizon/service.pp
1 file changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/329339/1

diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index 2702153..ffd5a7b 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -1,4 +1,4 @@
-# The OpenStack Dashboard Project
+# The OpenStack Das2hboard Project
 # http://docs.openstack.org/developer/horizon/
 class openstack::horizon::service(
 $novaconfig,
@@ -14,8 +14,9 @@
 require => Class['openstack::repo',  '::apache::mod::wsgi'];
 }
 
-package { [ 'python-keystoneclient',
-'python-openstack-auth',
+require_package('python-keystoneclient')
+
+package { [ 'python-openstack-auth',
 'python-designate-dashboard' ]:
 ensure  => present,
 }
@@ -111,18 +112,16 @@
 
 # Homemade totp plugin for keystoneclient
 file { 
'/usr/lib/python2.7/dist-packages/keystoneclient/auth/identity/v3/wmtotp.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/wmtotp.py",
-owner   => 'root',
-group   => 'root',
-require => Package['python-keystoneclient'],
-mode=> '0644',
+source => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/wmtotp.py",
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
 }
 file { 
'/usr/lib/python2.7/dist-packages/keystoneclient/auth/identity/v3/__init__.py':
-source  => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/__init__.py",
-owner   => 'root',
-group   => 'root',
-require => Package['python-keystoneclient'],
-mode=> '0644',
+source => 
"puppet:///modules/openstack/${openstack_version}/keystoneclient/__init__.py",
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
 }
 
 # Homemade totp plugin for openstack_auth

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fedf27aba4aeedb6fb1b763f1852632b0f0e308
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Newsletter.hook.php cleanup

2016-12-27 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329260 )

Change subject: Newsletter.hook.php cleanup
..


Newsletter.hook.php cleanup

Bug: T154136
Change-Id: Iede3a2ea76869f65a43ef2ba3b23fd79010a587a
---
M Newsletter.hooks.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 10 insertions(+), 4 deletions(-)

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



diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 3c74ba5..98cf4b3 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -229,7 +229,7 @@
 
foreach ( $rows as $row ) {
if ( (int)$row->nl_main_page_id === 
$newsletter->getPageId() && (int)$row->nl_active === 1 ) {
-   throw new ErrorPageError( 
'newsletter-mainpage-in-use','newsletter-mainpage-in-use' );
+   throw new ErrorPageError( 
'newsletter-mainpage-in-use','newsletter-mainpage-in-use-title' );
}
}
$success = $store->restoreNewsletter( $newsletterName );
@@ -237,8 +237,12 @@
return true;
}
}
-   // Show error message and allow resubmitting in case of failure
-   return Status::newFatal( 'newsletter-restore-failure', 
$newsletterName );
+   // Throw error message
+   throw new ErrorPageError(
+   'newsletter-restore-failure-title',
+   wfMessage( 'newsletter-restore-failure', 
$newsletterName )
+   );
+   return true;
}
 
/**
@@ -253,7 +257,7 @@
if ( $newsletter ) {

NewsletterStore::getDefaultInstance()->updateName( $newsletter->getId(), 
$newtitle->getText() );
} else {
-   throw new MWException( 'Cannot find 
newsletter with name \"' + $title->getText() + '\"' );
+   throw new MWException( 'Cannot find 
newsletter with name \"' . $title->getText() . '\"' );
}
}
return true;
diff --git a/i18n/en.json b/i18n/en.json
index e08237e..2eefef7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -155,6 +155,7 @@
"log-action-filter-newsletter-newsletter-removed": "Newsletter 
deletion",
"log-action-filter-newsletter-issue-added": "New issue announcements",
"newsletter-restore-failure": "\"$1\" newsletter could not be restored. 
Please try again.",
+   "newsletter-restore-failure-title": "Newsletter could not be restored.",
"newsletter-diff-descheader": "Changes in the description:",
"newsletter-diff-mainpageheader": "Changes in Main Page:",
"newsletter-diff-publishersheader": "Changes in publishers:"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 964f612..02d2f28 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -162,6 +162,7 @@
"log-action-filter-newsletter-newsletter-removed": 
"{{doc-log-action-filter-action|newsletter|newsletter-removed}}",
"log-action-filter-newsletter-issue-added": 
"{{doc-log-action-filter-action|newsletter|issue-added}}",
"newsletter-restore-failure": "Error message shown on 
title=Special:Undelete=Newsletter:=submit when the 
newsletter restoration fails.\n\nParameters:\n* $1 - Newsletter name",
+   "newsletter-restore-failure-title": "Title for 
\"newsletter-restore-failure\"",
"newsletter-diff-descheader": "Header for the diff of the description 
between two revisions",
"newsletter-diff-mainpageheader": "Header for the diff of Main Page 
between two revisions",
"newsletter-diff-publishersheader": "Header for the diff of publishers 
between two revisions"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iede3a2ea76869f65a43ef2ba3b23fd79010a587a
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Restructured SpecialNewLexeme tests

2016-12-27 Thread Aleksey Bekh-Ivanov (WMDE) (Code Review)

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329338 )

Change subject: Restructured SpecialNewLexeme tests
..

Restructured SpecialNewLexeme tests

Change-Id: Ifa9ff1c7c08897ca2ef1f08b1ed1ccf03f5164c5
Task: T150205
Depends-On: I1c432364143a346693f1e6cbc5085e83c7ecd2d6
---
M tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php
1 file changed, 98 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme 
refs/changes/38/329338/1

diff --git a/tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php 
b/tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php
index 34c5fad..3c49566 100644
--- a/tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php
+++ b/tests/phpunit/mediawiki/Specials/SpecialNewLexemeTest.php
@@ -2,9 +2,12 @@
 
 namespace Wikibase\Lexeme\Tests\Specials;
 
-use SpecialPageTestBase;
+use Wikibase\DataModel\Entity\EntityDocument;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\Lexeme\DataModel\Lexeme;
+use Wikibase\Lexeme\DataModel\LexemeId;
 use Wikibase\Lexeme\Specials\SpecialNewLexeme;
-use Wikibase\Repo\Specials\SpecialNewProperty;
+use Wikibase\Repo\Tests\Specials\SpecialNewEntityTest;
 
 /**
  * @covers Wikibase\Lexeme\Specials\SpecialNewLexeme
@@ -17,37 +20,109 @@
  * @license GPL-2.0+
  * @author Amir Sarabadani 
  */
-class SpecialNewLemexeTest extends SpecialPageTestBase {
+class SpecialNewLemexeTest extends SpecialNewEntityTest {
+
+   protected function setUp() {
+   parent::setUp();
+
+   $this->setUserLang( 'en' );
+   }
 
protected function newSpecialPage() {
return new SpecialNewLexeme();
}
 
-   public function testExecute() {
+   public function testAllNecessaryFormFieldsArePresent_WhenRendered() {
 
-   $matchers['lemma'] = [
-   'tag' => 'div',
-   'attributes' => [
-   'id' => 'wb-newentity-label',
+   list( $html ) = $this->executeSpecialPage();
+
+   $this->assertHtmlContainsInputWithName( $html, 'lang' );
+   $this->assertHtmlContainsInputWithName( $html, 'lemma' );
+   $this->assertHtmlContainsSubmitControl( $html );
+   }
+
+   public function testLemmaValueIsSetAccordingToSubpage_WhenRendered() {
+   $subPage = 'LemmaText';
+
+   list( $html ) = $this->executeSpecialPage( $subPage );
+
+   $this->assertHtmlContainsInputWithNameAndValue( $html, 'lemma', 
$subPage );
+   }
+
+   /**
+* Data provider method
+*
+* @return array[][]
+*/
+   public function provideValidEntityCreationRequests() {
+   return [
+   'lemma is set' => [
+   [
+   'lang' => 'en',
+   'lemma' => 'some lemma text',
+   ],
],
-   'child' => [
-   'tag' => 'input',
-   'attributes' => [
-   'name' => 'lemma',
-   ]
-   ] ];
+   'another language' => [
+   [
+   'lang' => 'fr',
+   'lemma' => 'some lemma text',
+   ],
+   ],
+   ];
+   }
 
-   list( $output, ) = $this->executeSpecialPage( '' );
-   foreach ( $matchers as $key => $matcher ) {
-   $this->assertTag( $matcher, $output, "Failed to match 
html output with tag '{$key}''" );
-   }
+   /**
+* Data provider method
+*
+* @return array[]
+*/
+   public function provideInvalidEntityCreationRequests() {
+   $this->markTestSkipped( "Fixes in code are needed" );
 
-   list( $output, ) = $this->executeSpecialPage( 'LemmaText' );
-   $matchers['lemma']['child'][0]['attributes']['value'] = 
'LemmaText';
+   return [
+   'unknown language' => [
+   [
+   'lang' => 'some-weird-language',
+   'lemma' => 'some lemma',
+   ],
+   'language code was not recognized',
+   ],
+   'empty lemma' => [
+   [
+   'lang' => 'en',
+   'lemma' => '',
+   ],
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes::apiserver: Fix admission_control if clause

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329337 )

Change subject: kubernetes::apiserver: Fix admission_control if clause
..


kubernetes::apiserver: Fix admission_control if clause

By a copy/paste typo, the admission control if guard was using a wrong
if clause. Fix that

Change-Id: I780d808de921bb2cf4721593f9b9a1b96460c81f
---
M modules/k8s/templates/kube-apiserver.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/k8s/templates/kube-apiserver.default.erb 
b/modules/k8s/templates/kube-apiserver.default.erb
index 169c7b0..2765ebd 100644
--- a/modules/k8s/templates/kube-apiserver.default.erb
+++ b/modules/k8s/templates/kube-apiserver.default.erb
@@ -22,7 +22,7 @@
 KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=<%= 
@service_cluster_ip_range %>"
 <%- end -%>
 #
-<%- if @service_cluster_ip_range %>
+<%- if @admission_control %>
 KUBE_ADMISSION_CONTROL="--admission-control=<%= @admission_control %>"
 <%- end -%>
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I780d808de921bb2cf4721593f9b9a1b96460c81f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Force docker bridge IP address per host

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329334 )

Change subject: Force docker bridge IP address per host
..


Force docker bridge IP address per host

Kubernetes requires that every node gives their pods a unique IP across
the cluster, force the allocation manually per host to ensure that

Change-Id: Iffd6a55345b39d82aa01d0fe449ec0f0dbee1ef6
---
A hieradata/hosts/kubernetes1001.yaml
A hieradata/hosts/kubernetes1002.yaml
A hieradata/hosts/kubernetes1003.yaml
A hieradata/hosts/kubernetes1004.yaml
M modules/profile/manifests/docker/engine.pp
5 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/kubernetes1001.yaml 
b/hieradata/hosts/kubernetes1001.yaml
new file mode 100644
index 000..626fde0
--- /dev/null
+++ b/hieradata/hosts/kubernetes1001.yaml
@@ -0,0 +1,2 @@
+profile::docker::engine::settings:
+   bip: 192.168.31.1/24
diff --git a/hieradata/hosts/kubernetes1002.yaml 
b/hieradata/hosts/kubernetes1002.yaml
new file mode 100644
index 000..0707de7
--- /dev/null
+++ b/hieradata/hosts/kubernetes1002.yaml
@@ -0,0 +1,2 @@
+profile::docker::engine::settings:
+   bip: 192.168.32.1/24
diff --git a/hieradata/hosts/kubernetes1003.yaml 
b/hieradata/hosts/kubernetes1003.yaml
new file mode 100644
index 000..3eb97f7
--- /dev/null
+++ b/hieradata/hosts/kubernetes1003.yaml
@@ -0,0 +1,2 @@
+profile::docker::engine::settings:
+   bip: 192.168.33.1/24
diff --git a/hieradata/hosts/kubernetes1004.yaml 
b/hieradata/hosts/kubernetes1004.yaml
new file mode 100644
index 000..f5d3679
--- /dev/null
+++ b/hieradata/hosts/kubernetes1004.yaml
@@ -0,0 +1,2 @@
+profile::docker::engine::settings:
+   bip: 192.168.34.1/24
diff --git a/modules/profile/manifests/docker/engine.pp 
b/modules/profile/manifests/docker/engine.pp
index 60b21d0..7695379 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -6,7 +6,9 @@
 class profile::docker::engine {
 
 # Optional parameters
-$docker_settings = hiera('profile::docker::engine::settings', {})
+# We want to get settings across the hierarchy, some per host, some fleet
+# wide. So use hiera_hash to merge keys across the hierarchy
+$docker_settings = hiera_hash('profile::docker::engine::settings', {})
 # Version to install; the default is not to pick one.
 $docker_version = hiera('profile::docker::engine::version', 'present')
 $apt_proxy = hiera('profile::docker::engine::proxy', undef)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffd6a55345b39d82aa01d0fe449ec0f0dbee1ef6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Instruct docker to not handle iptables

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329333 )

Change subject: kubernetes: Instruct docker to not handle iptables
..


kubernetes: Instruct docker to not handle iptables

Since we want to have iptables rules handled via kubernetes, having
docker handling iptables rules will only lead to confusion. Disable that
in docker default hiera settings

Change-Id: I47f78146f0dad5a539503d0e28c47c9b3adea4cb
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 94c6d6e..1c7ccfc 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -7,3 +7,6 @@
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'
+profile::docker::engine::settings:
+   iptables: false
+   ip-masq: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes::apiserver: Fix admission_control if clause

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329337 )

Change subject: kubernetes::apiserver: Fix admission_control if clause
..

kubernetes::apiserver: Fix admission_control if clause

By a copy/paste typo, the admission control if guard was using a wrong
if clause. Fix that

Change-Id: I780d808de921bb2cf4721593f9b9a1b96460c81f
---
M modules/k8s/templates/kube-apiserver.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/329337/1

diff --git a/modules/k8s/templates/kube-apiserver.default.erb 
b/modules/k8s/templates/kube-apiserver.default.erb
index 169c7b0..2765ebd 100644
--- a/modules/k8s/templates/kube-apiserver.default.erb
+++ b/modules/k8s/templates/kube-apiserver.default.erb
@@ -22,7 +22,7 @@
 KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=<%= 
@service_cluster_ip_range %>"
 <%- end -%>
 #
-<%- if @service_cluster_ip_range %>
+<%- if @admission_control %>
 KUBE_ADMISSION_CONTROL="--admission-control=<%= @admission_control %>"
 <%- end -%>
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I780d808de921bb2cf4721593f9b9a1b96460c81f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated function Article::doEdit()

2016-12-27 Thread Subins2000 (Code Review)

Subins2000 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329336 )

Change subject: Remove deprecated function Article::doEdit()
..

Remove deprecated function Article::doEdit()

Article::doEdit() (deprecated in 1.21) was removed.

Bug: T61113
Change-Id: Ie6c1bb4ee5ee45ac2db432877a7038659231c091
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/329336/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 43f21ef..6a246b6 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -137,6 +137,7 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* Article::doEdit() (deprecated in 1.21) was removed.
 
 == Compatibility ==
 
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 4bcb655..cb30a77 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2037,17 +2037,6 @@
 
/**
 * Call to WikiPage function for backwards compatibility.
-* @see WikiPage::doEdit
-*
-* @deprecated since 1.21: use doEditContent() instead.
-*/
-   public function doEdit( $text, $summary, $flags = 0, $baseRevId = 
false, $user = null ) {
-   wfDeprecated( __METHOD__, '1.21' );
-   return $this->mPage->doEdit( $text, $summary, $flags, 
$baseRevId, $user );
-   }
-
-   /**
-* Call to WikiPage function for backwards compatibility.
 * @see WikiPage::doEditContent
 */
public function doEditContent( Content $content, $summary, $flags = 0, 
$baseRevId = false,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated function Article::getContent()

2016-12-27 Thread Subins2000 (Code Review)

Subins2000 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329335 )

Change subject: Remove deprecated function Article::getContent()
..

Remove deprecated function Article::getContent()

Change-Id: If77b15dee46230ce3e9f0d2f320d437d813b47e6
Article::getContent() (deprecated in 1.21) was removed.
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 1 insertion(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/329335/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 43f21ef..53a164a 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -137,6 +137,7 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* Article::getContent() (deprecated in 1.21) was removed.
 
 == Compatibility ==
 
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 4bcb655..4d90f4b 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -198,24 +198,6 @@
}
 
/**
-* Note that getContent does not follow redirects anymore.
-* If you need to fetch redirectable content easily, try
-* the shortcut in WikiPage::getRedirectTarget()
-*
-* This function has side effects! Do not use this function if you
-* only want the real revision text if any.
-*
-* @deprecated since 1.21; use WikiPage::getContent() instead
-*
-* @return string Return the text of this revision
-*/
-   public function getContent() {
-   wfDeprecated( __METHOD__, '1.21' );
-   $content = $this->getContentObject();
-   return ContentHandler::getContentText( $content );
-   }
-
-   /**
 * Returns a Content object representing the pages effective display 
content,
 * not necessarily the revision's content!
 *

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kubernetes: Instruct docker to not handle iptables

2016-12-27 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329333 )

Change subject: kubernetes: Instruct docker to not handle iptables
..

kubernetes: Instruct docker to not handle iptables

Since we want to have iptables rules handled via kubernetes, having
docker handling iptables rules will only lead to confusion. Disable that
in docker default hiera settings

Change-Id: I47f78146f0dad5a539503d0e28c47c9b3adea4cb
---
M hieradata/role/common/kubernetes/worker.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/329333/1

diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 94c6d6e..1c7ccfc 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -7,3 +7,6 @@
 profile::docker::engine::proxy: "http://webproxy.%{::site}.wmnet:8080;
 profile::kubernetes::master_host: 'argon.eqiad.wmnet'
 profile::kubernetes::infra_pod: 'darmstadtium.eqiad.wmnet/pause'
+profile::docker::engine::settings:
+   iptables: false
+   ip-masq: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47f78146f0dad5a539503d0e28c47c9b3adea4cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

1 2 >

1 - 100 of 117 matches

Mail list logo