date:20170907

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Sniff & fix lowercase @inheritdoc

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Sniff & fix lowercase @inheritdoc
..


Sniff & fix lowercase @inheritdoc

@inheritDoc seems to be the more official casing, per the (draft)
PSR-5 [1], recent versions of phpDocumentor [2], and Java [3]
(where the tag originates); but there is plenty of ambiguity,
with old phpDocumentor [4], PHPStorm [5] and NetBeans [6] using
the lowercase form.

The old code just ignored @inheritdoc, leading to confusing error
messages. Treat it as an error of its own instead (and auto-fix
when asked).

[1] 
https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc.md#61-making-inheritance-explicit-using-the-inheritdoc-tag
[2] https://docs.phpdoc.org/guides/inheritance.html#the-inheritdoc-tag
[3] 
http://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#@inheritDoc
[4] 
https://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_tags.inlineinheritdoc.pkg.html
[5] https://youtrack.jetbrains.com/issue/WI-10670#comment=27-330998
[6] https://blogs.oracle.com/netbeansphp/inheritdoc-tag-support-added

Change-Id: If8dad50868f507643b71349c6788f41847f32ac9
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
4 files changed, 26 insertions(+), 3 deletions(-)

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



diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 90e8975..2c5ff92 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -147,6 +147,13 @@
}
} elseif ( $tagText === '@inheritDoc' ) {
$inheritDoc = true;
+   } elseif ( $tagText === '@inheritdoc' ) {
+   $inheritDoc = true;
+   $error = 'Incorrect capitalization of 
@inheritDoc';
+   $fix = $phpcsFile->addFixableError( $error, 
$tag, 'LowercaseInheritDoc' );
+   if ( $fix === true ) {
+   $phpcsFile->fixer->replaceToken( $tag, 
"@inheritDoc" );
+   }
}
}
if ( $inheritDoc ) {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php 
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index 4df60b6..4341489 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -100,6 +100,13 @@
public function testVariablePunctation( $aBool, $anInt ) {
return $aBool;
}
+
+   /**
+* @inheritdoc
+*/
+   public function testInheritWrongCase( $stuff, $more, $blah ) {
+   $blah = $more . $stuff . $blah;
+   }
 }
 
 class TestPassedExamples {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index db1809e..f37b542 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -72,8 +72,10 @@
  |   | (MediaWiki.Commenting.FunctionComment.NotPunctuationParam)
   98 | ERROR | [x] Return type should not end with punctuation ":"
  |   | (MediaWiki.Commenting.FunctionComment.NotPunctuationReturn)
- 105 | ERROR | [ ] Only one class is allowed in a file
+ 105 | ERROR | [x] Incorrect capitalization of @inheritDoc
+ |   | (MediaWiki.Commenting.FunctionComment.LowercaseInheritDoc)
+ 112 | ERROR | [ ] Only one class is allowed in a file
  |   | (MediaWiki.Files.OneClassPerFile.MultipleFound)
- 172 | ERROR | [ ] Only one class is allowed in a file
+ 179 | ERROR | [ ] Only one class is allowed in a file
  |   | (MediaWiki.Files.OneClassPerFile.MultipleFound)
-PHPCBF CAN FIX THE 28 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX THE 29 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
index 60ae018..ed5b5eb 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
@@ -100,6 +100,13 @@
public function testVariablePunctation( $aBool, $anInt ) {
return $aBool;
}
+
+   /**
+* @inheritDoc
+*/
+   public function

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Restore page status buttons

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Restore page status buttons
..

Restore page status buttons

EditPage::getCheckboxes() is deprecated and not really called anymore.
So override EditPage::getCheckboxesWidget() instead, and just fit the
generated HTML into a generic OOUI widget.

Bug: T175304
Change-Id: I6b0abfbdd2ce1fe7d200365af0a9b26df26edebc
---
M includes/page/EditPagePage.php
1 file changed, 7 insertions(+), 5 deletions(-)


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

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index b6c4dc4..524ba24 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -7,6 +7,7 @@
 use EditPage;
 use Html;
 use MWException;
+use OOUI;
 use ProofreadPage\Context;
 use ProofreadPagePage;
 use Status;
@@ -145,9 +146,9 @@
/**
 * Sets the checkboxes for the proofreading status of the page.
 *
-* @see EditPage::getCheckBoxes
+* @see EditPage::getCheckboxesWidget
 */
-   public function getCheckBoxes( &$tabindex, $checked ) {
+   public function getCheckboxesWidget( &$tabindex, $checked ) {
$oldLevel = $this->getCurrentContent()->getLevel();
 
$content = $this->toEditContent( $this->textbox1 );
@@ -155,7 +156,7 @@
 
$qualityLevels = [ 0, 2, 1, 3, 4 ];
$html = '';
-   $checkboxes = parent::getCheckBoxes( $tabindex, $checked );
+   $checkboxes = parent::getCheckboxesWidget( $tabindex, $checked 
);
$user = $this->context->getUser();
 
foreach ( $qualityLevels as $level ) {
@@ -180,9 +181,9 @@
Html::closeElement( 'span' );
}
 
-   $checkboxes['wpr-pageStatus'] = '';
+   $checkboxes['wpr-pageStatus'] = new OOUI\Widget( [ 'content' => 
new OOUI\HtmlSnippet( '' ) ] );
if ( $user->isAllowed( 'pagequality' ) ) {
-   $checkboxes['wpr-pageStatus'] =
+   $content =
Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
$html .
Html::closeElement( 'span' ) .
@@ -190,6 +191,7 @@
$this->context->msg( 
'proofreadpage_page_status' )
->title( $this->getTitle() )->parse() .
Html::closeElement( 'label' );
+   $checkboxes['wpr-pageStatus'] = new OOUI\Widget( [ 
'content' => new OOUI\HtmlSnippet( $content ) ] );
}
 
return $checkboxes;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add `border-radius` to align to WikimediaUI Style Guide

2017-09-07 Thread VolkerE (Code Review)

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

Change subject: Add `border-radius` to align to WikimediaUI Style Guide
..

Add `border-radius` to align to WikimediaUI Style Guide

Adding `border-radius` in order to align to WikimediaUI Style Guide
and be more harmonious.

Change-Id: I4bda42c03a5dbf35866df4413cdb4324912a
---
M resources/src/mediawiki.special/mediawiki.special.search.styles.css
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/376660/1

diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.styles.css 
b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
index 3b98936..b37cf2f 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
@@ -51,6 +51,7 @@
background-color: #f8f9fa;
margin-top: 1em;
border: 1px solid #c8ccd1;
+   border-radius: 2px;
 }
 .search-types {
float: left;
@@ -93,11 +94,11 @@
 /*==*/
 
 #mw-searchoptions {
-   margin: 0;
padding: 0.5em 0.75em 0.75em 0.75em;
background-color: #f8f9fa;
+   margin: -1px 0 0;
border: 1px solid #c8ccd1;
-   border-top-width: 0;
+   border-radius: 0 0 2px 2px;
 }
 #mw-searchoptions legend {
display: none;

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Doc] Clean up uses of ' ' placeholder

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: [Doc] Clean up uses of '' placeholder
..


[Doc] Clean up uses of '' placeholder

Change-Id: I1fa0410e67c52c22d2391b97155730f45ec64498
---
M scripts/claimit.py
M scripts/coordinate_import.py
M scripts/match_images.py
M scripts/patrol.py
M scripts/revertbot.py
M scripts/script_wui.py
M scripts/surnames_redirects.py
7 files changed, 12 insertions(+), 10 deletions(-)

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



diff --git a/scripts/claimit.py b/scripts/claimit.py
index 845ad49..5741732 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -3,6 +3,10 @@
 """
 A script that adds claims to Wikidata items based on a list of pages.
 
+These command line parameters can be used to specify which pages to work on:
+
+
+
 --
 
 Usage:
diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py
index 41f6b47..1a1f3e0 100755
--- a/scripts/coordinate_import.py
+++ b/scripts/coordinate_import.py
@@ -21,6 +21,8 @@
 python pwb.py coordinate_import -lang:it -family:wikipedia \
 -namespace:0 -transcludes:Infobox_stazione_ferroviaria
 
+These command line parameters can be used to specify which pages to work on:
+
 
 """
 #
@@ -35,6 +37,8 @@
 from pywikibot import pagegenerators, WikidataBot
 from pywikibot.exceptions import CoordinateGlobeUnknownException
 
+docuReplacements = {'': pagegenerators.parameterHelp}
+
 
 class CoordImportRobot(WikidataBot):
 
diff --git a/scripts/match_images.py b/scripts/match_images.py
index d618bca..b5c8923 100755
--- a/scripts/match_images.py
+++ b/scripts/match_images.py
@@ -9,8 +9,6 @@
 
 It is essential to provide two images to work on.
 
-
-
 Furthermore, the following command line parameters are supported:
 
 -otherfamilyMentioned family with this parameter will be preferred for
diff --git a/scripts/patrol.py b/scripts/patrol.py
index bc3bdc9..98de168 100755
--- a/scripts/patrol.py
+++ b/scripts/patrol.py
@@ -27,6 +27,8 @@
 
 https://en.wikisource.org/wiki/User:Wikisource-bot/patrol_whitelist
 
+
+
 Commandline parameters
 ==
 
diff --git a/scripts/revertbot.py b/scripts/revertbot.py
index d417347..89d8d4b 100755
--- a/scripts/revertbot.py
+++ b/scripts/revertbot.py
@@ -5,8 +5,6 @@
 
 The following command line parameters are supported:
 
-
-
 -username Edits of which user need to be reverted.
 
 -rollback Rollback edits instead of reverting them.
diff --git a/scripts/script_wui.py b/scripts/script_wui.py
index e552a4e..839bf24 100755
--- a/scripts/script_wui.py
+++ b/scripts/script_wui.py
@@ -11,12 +11,6 @@
 (some code might get compiled on-the-fly, so a GNU compiler along
 with library header files is needed too)
 
-The following parameters are supported:
-
-
-
-All other parameters will be ignored.
-
 Syntax example:
 
 python pwb.py script_wui -dir:.
diff --git a/scripts/surnames_redirects.py b/scripts/surnames_redirects.py
index d817fda..ab19916 100755
--- a/scripts/surnames_redirects.py
+++ b/scripts/surnames_redirects.py
@@ -28,6 +28,8 @@
 from pywikibot import i18n, pagegenerators
 from pywikibot.bot import FollowRedirectPageBot, ExistingPageBot
 
+docuReplacements = {'': pagegenerators.parameterHelp}
+
 
 class SurnamesBot(ExistingPageBot, FollowRedirectPageBot):
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fa0410e67c52c22d2391b97155730f45ec64498
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
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...UniversalLanguageSelector[master]: Align box shadow and colors to WikimediaUI Style Guide

2017-09-07 Thread VolkerE (Code Review)

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

Change subject: Align box shadow and colors to WikimediaUI Style Guide
..

Align box shadow and colors to WikimediaUI Style Guide

Aligning `box-shadow` and `color` values to WikimediaUI Style Guide
defaults.

Bug: T175295
Change-Id: If5f75e57081112c4ce60b04a1061aeae48c25353
---
M resources/css/ext.uls-vector.less
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/59/376659/1

diff --git a/resources/css/ext.uls-vector.less 
b/resources/css/ext.uls-vector.less
index 2ea0526..ba6020b 100644
--- a/resources/css/ext.uls-vector.less
+++ b/resources/css/ext.uls-vector.less
@@ -1,3 +1,15 @@
+@import 'mediawiki.mixins';
+
 .uls-menu {
+   border-color: #c8ccd1;
+   .box-shadow( 0 2px 2px 0 rgba( 0, 0, 0, 0.25 ) ); // Overwrite 
lib/jquery.uls
font-size: 0.875em; // not inherited from `.mw-body-content`, as we 
insert at `body`
 }
+
+.uls-search {
+   border-bottom-color: #c8ccd1;
+}
+
+.uls-filtersuggestion {
+   color: #72777d;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5f75e57081112c4ce60b04a1061aeae48c25353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-wmf-branch: update .gitreview

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: make-wmf-branch: update .gitreview
..

make-wmf-branch: update .gitreview

...to prevent accidental pushes to master

Bug: T175324
Change-Id: I945b9c5fad5ba06d938759ad76b00f527f262964
---
M make-wmf-branch/MakeWmfBranch.php
1 file changed, 27 insertions(+), 0 deletions(-)


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

diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index fd7dc5a..b9eab6a 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -199,6 +199,29 @@
$this->chdir( $this->buildDir );
}
 
+   function updateGitreview( $path, $version ) {
+   $fileName = "$path/.gitreview";
+   $file = file_get_contents( $fileName );
+   if ( $file === false ) {
+   $this->croak( "Can't open file $fileName" );
+   }
+
+   if ( strpos( $file, 'defaultbranch=' ) !== false ) {
+   $file = preg_replace( '/^defaultbranch=\w+/m', 
"defaultbranch=$version", $file );
+   } else {
+   $file .= "\ndefaultbranch=$version\n";
+   }
+
+   if ( $this->dryRun ) {
+   echo "[dry-run] Would have modified $fileName with the 
following content:\n\n$file\n";
+   return;
+   }
+
+   file_put_contents( $fileName, $file );
+
+   $this->runWriteCmd( 'git', 'add', $fileName );
+   }
+
function branchWmf( $clonePath ) {
# Clone the repository
$oldVersion = $this->oldVersion == 'master' ? 'master' : 
$this->branchPrefix . $this->oldVersion;
@@ -249,6 +272,10 @@
# Fix $wgVersion
$this->fixVersion( "includes/DefaultSettings.php" );
 
+   # Tweak .gitreview to prevent people from accidentally 
submitting changes intended
+   # for this branch to master
+   $this->updateGitreview( '.', $newVersion );
+
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new 
WMF {$this->newVersion} branch" );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I945b9c5fad5ba06d938759ad76b00f527f262964
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Made "table" format sortable

2017-09-07 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376657 )

Change subject: Made "table" format sortable
..


Made "table" format sortable

Change-Id: I59d96c4056f06793aead5a7d3c10e1d869b73f9a
---
M formats/CargoTableFormat.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/formats/CargoTableFormat.php b/formats/CargoTableFormat.php
index d322b63..efc8714 100644
--- a/formats/CargoTableFormat.php
+++ b/formats/CargoTableFormat.php
@@ -21,7 +21,7 @@
function display( $valuesTable, $formattedValuesTable, 
$fieldDescriptions, $displayParams ) {
$this->mOutput->addModuleStyles( 'ext.cargo.main' );
 
-   $text = '';
+   $text = '';
$text .= '';
foreach ( array_keys( $fieldDescriptions ) as $field ) {
if ( strpos( $field, 'Blank value ' ) === false ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59d96c4056f06793aead5a7d3c10e1d869b73f9a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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]: Made "table" format sortable

2017-09-07 Thread Yaron Koren (Code Review)

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

Change subject: Made "table" format sortable
..

Made "table" format sortable

Change-Id: I59d96c4056f06793aead5a7d3c10e1d869b73f9a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/57/376657/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59d96c4056f06793aead5a7d3c10e1d869b73f9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Follow core base font-size in Vector

2017-09-07 Thread VolkerE (Code Review)

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

Change subject: Follow core base font-size in Vector
..

Follow core base font-size in Vector

Following core base font-size of `0.875em` in Vector to align with
other elements on the page.

Bug: T175295
Change-Id: Id9c8652820641d6fa1c6b1dd06247967ba649f25
---
M extension.json
A resources/css/ext.uls-vector.less
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/56/376656/1

diff --git a/extension.json b/extension.json
index 2eda62a..903af81 100644
--- a/extension.json
+++ b/extension.json
@@ -160,7 +160,8 @@
"scripts": "js/ext.uls.common.js",
"styles": "css/ext.uls.less",
"skinStyles": {
-   "monobook": "css/ext.uls-monobook.css"
+   "monobook": "css/ext.uls-monobook.css",
+   "vector": "css/ext.uls-vector.less"
},
"dependencies": [
"mediawiki.api",
diff --git a/resources/css/ext.uls-vector.less 
b/resources/css/ext.uls-vector.less
new file mode 100644
index 000..b48faf5
--- /dev/null
+++ b/resources/css/ext.uls-vector.less
@@ -0,0 +1,3 @@
+.uls-menu {
+   font-size: 0.875em; // not inherited from `.mw-body-content`, as we 
insert at `body`
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c8652820641d6fa1c6b1dd06247967ba649f25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Actually delete extensions/ArticleCreationWorkflow

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Actually delete extensions/ArticleCreationWorkflow
..


Actually delete extensions/ArticleCreationWorkflow

Change-Id: Ia1dfd909b9a0d3a91be3dc6108ba1f2e749f7c31
---
D extensions/ArticleCreationWorkflow
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
deleted file mode 16
index 7ed2ae9..000
--- a/extensions/ArticleCreationWorkflow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ed2ae91a6677e02f4eb4c0940713be1bb80f447

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1dfd909b9a0d3a91be3dc6108ba1f2e749f7c31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Actually delete extensions/ArticleCreationWorkflow

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Actually delete extensions/ArticleCreationWorkflow
..

Actually delete extensions/ArticleCreationWorkflow

Change-Id: Ia1dfd909b9a0d3a91be3dc6108ba1f2e749f7c31
---
D extensions/ArticleCreationWorkflow
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/376655/1

diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
deleted file mode 16
index 7ed2ae9..000
--- a/extensions/ArticleCreationWorkflow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ed2ae91a6677e02f4eb4c0940713be1bb80f447

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Creating new WMF 1.30.0-wmf.17 branch"

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Creating new WMF 1.30.0-wmf.17 branch"
..


Revert "Creating new WMF 1.30.0-wmf.17 branch"

This reverts commit 579f1bb11996f5e83d02828ab460335ebb7c1272.

Change-Id: I59e97e578d4c7e46f4aecc330fc14047a40c3495
---
D .gitmodules
A extensions/.gitignore
D extensions/AbuseFilter
D extensions/ActiveAbstract
D extensions/AntiSpoof
D extensions/ApiFeatureUsage
D extensions/Babel
D extensions/BetaFeatures
D extensions/BounceHandler
D extensions/Calendar
D extensions/Campaigns
D extensions/Capiunto
D extensions/CategoryTree
D extensions/CentralAuth
D extensions/CentralNotice
D extensions/CharInsert
D extensions/CheckUser
D extensions/CirrusSearch
D extensions/Cite
D extensions/CiteThisPage
D extensions/Citoid
D extensions/CleanChanges
D extensions/CodeEditor
D extensions/CodeMirror
D extensions/CodeReview
D extensions/Cognate
D extensions/CollaborationKit
D extensions/Collection
D extensions/CommonsMetadata
D extensions/ConfirmEdit
D extensions/ContactPage
D extensions/ContentTranslation
D extensions/ContributionTracking
D extensions/CreditsSource
D extensions/Dashiki
D extensions/DisableAccount
D extensions/Disambiguator
D extensions/DismissableSiteNotice
D extensions/DonationInterface
D extensions/DoubleWiki
D extensions/DynamicSidebar
D extensions/Echo
D extensions/EducationProgram
D extensions/Elastica
D extensions/ElectronPdfService
D extensions/EventBus
D extensions/EventLogging
D extensions/ExtensionDistributor
D extensions/FeaturedFeeds
D extensions/FlaggedRevs
D extensions/Flow
D extensions/FundraiserLandingPage
D extensions/FundraisingTranslateWorkflow
D extensions/GWToolset
D extensions/Gadgets
D extensions/GeoCrumbs
D extensions/GeoData
D extensions/GettingStarted
D extensions/GlobalBlocking
D extensions/GlobalCssJs
D extensions/GlobalUsage
D extensions/GlobalUserPage
D extensions/GoogleNewsSitemap
D extensions/Graph
D extensions/GuidedTour
D extensions/ImageMap
D extensions/InputBox
D extensions/Insider
D extensions/Interwiki
D extensions/InterwikiSorting
D extensions/Josa
D extensions/JsonConfig
D extensions/Kartographer
D extensions/LabeledSectionTransclusion
D extensions/LandingCheck
D extensions/LdapAuthentication
D extensions/Linter
D extensions/LiquidThreads
D extensions/Listings
D extensions/LocalisationUpdate
D extensions/LoginNotify
D extensions/MapSources
D extensions/MassMessage
D extensions/Math
D extensions/MobileApp
D extensions/MobileFrontend
D extensions/MultimediaViewer
D extensions/MwEmbedSupport
D extensions/NavigationTiming
D extensions/NewUserMessage
D extensions/Newsletter
D extensions/Nuke
D extensions/OATHAuth
D extensions/OAuth
D extensions/ORES
D extensions/OpenStackManager
D extensions/PageAssessments
D extensions/PageImages
D extensions/PageTriage
D extensions/PageViewInfo
D extensions/PagedTiffHandler
D extensions/ParserFunctions
D extensions/ParserMigration
D extensions/ParsoidBatchAPI
D extensions/PdfHandler
D extensions/Petition
D extensions/Poem
D extensions/PoolCounter
D extensions/Popups
D extensions/ProofreadPage
D extensions/QuickSurveys
D extensions/Quiz
A extensions/README
D extensions/RSS
D extensions/RelatedArticles
D extensions/RelatedSites
D extensions/Renameuser
D extensions/RevisionSlider
D extensions/SandboxLink
D extensions/Score
D extensions/Scribunto
D extensions/SearchExtraNS
D extensions/SecurePoll
D extensions/ShortUrl
D extensions/SiteMatrix
D extensions/SpamBlacklist
D extensions/SubPageList3
D extensions/SubpageSortkey
D extensions/SyntaxHighlight_GeSHi
D extensions/TemplateData
D extensions/TemplateSandbox
D extensions/TemplateStyles
D extensions/TextExtracts
D extensions/Thanks
D extensions/TimedMediaHandler
D extensions/TitleBlacklist
D extensions/TocTree
D extensions/TorBlock
D extensions/Translate
D extensions/TranslationNotifications
D extensions/TrustedXFF
D extensions/TwoColConflict
D extensions/UnicodeConverter
D extensions/UniversalLanguageSelector
D extensions/UploadWizard
D extensions/UploadsLink
D extensions/UrlShortener
D extensions/UserMerge
D extensions/VectorBeta
D extensions/VipsScaler
D extensions/VisualEditor
D extensions/WikiEditor
D extensions/WikiLove
D extensions/Wikidata
D extensions/WikidataPageBanner
D extensions/WikimediaEvents
D extensions/WikimediaIncubator
D extensions/WikimediaMaintenance
D extensions/WikimediaMessages
D extensions/XAnalytics
D extensions/ZeroBanner
D extensions/ZeroPortal
D extensions/cldr
D extensions/intersection
D extensions/timeline
D extensions/wikihiero
M includes/DefaultSettings.php
D skins/CologneBlue
D skins/MinervaNeue
D skins/Modern
D skins/MonoBook
D skins/Nostalgia
D skins/Timeless
D skins/Vector
D vendor
175 files changed, 34 insertions(+), 859 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Sniff & fix lowercase @inheritdoc

2017-09-07 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376654 )

Change subject: Sniff & fix lowercase @inheritdoc
..

Sniff & fix lowercase @inheritdoc

@inheritDoc seems to be the more official casing, per the (draft)
PSR-5 [1], recent versions of phpDocumentor [2], and Java [3]
(where the tag originates); but there is plenty of ambiguity,
with old phpDocumentor [4], PHPStorm [5] and NetBeans [6] using
the lowercase form.

The old code just ignored @inheritdoc, leading to confusing error
messages. Treat it as an error of its own instead (and auto-fix
when asked).

[1] 
https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc.md#61-making-inheritance-explicit-using-the-inheritdoc-tag
[2] https://docs.phpdoc.org/guides/inheritance.html#the-inheritdoc-tag
[3] 
http://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#@inheritDoc
[4] 
https://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_tags.inlineinheritdoc.pkg.html
[5] https://youtrack.jetbrains.com/issue/WI-10670#comment=27-330998
[6] https://blogs.oracle.com/netbeansphp/inheritdoc-tag-support-added

Change-Id: If8dad50868f507643b71349c6788f41847f32ac9
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/54/376654/1

diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 90e8975..2c5ff92 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -147,6 +147,13 @@
}
} elseif ( $tagText === '@inheritDoc' ) {
$inheritDoc = true;
+   } elseif ( $tagText === '@inheritdoc' ) {
+   $inheritDoc = true;
+   $error = 'Incorrect capitalization of 
@inheritDoc';
+   $fix = $phpcsFile->addFixableError( $error, 
$tag, 'LowercaseInheritDoc' );
+   if ( $fix === true ) {
+   $phpcsFile->fixer->replaceToken( $tag, 
"@inheritDoc" );
+   }
}
}
if ( $inheritDoc ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8dad50868f507643b71349c6788f41847f32ac9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Creating new WMF 1.30.0-wmf.17 branch"

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Revert "Creating new WMF 1.30.0-wmf.17 branch"
..

Revert "Creating new WMF 1.30.0-wmf.17 branch"

This reverts commit 579f1bb11996f5e83d02828ab460335ebb7c1272.

Change-Id: I59e97e578d4c7e46f4aecc330fc14047a40c3495
---
D .gitmodules
A extensions/.gitignore
D extensions/AbuseFilter
D extensions/ActiveAbstract
D extensions/AntiSpoof
D extensions/ApiFeatureUsage
D extensions/Babel
D extensions/BetaFeatures
D extensions/BounceHandler
D extensions/Calendar
D extensions/Campaigns
D extensions/Capiunto
D extensions/CategoryTree
D extensions/CentralAuth
D extensions/CentralNotice
D extensions/CharInsert
D extensions/CheckUser
D extensions/CirrusSearch
D extensions/Cite
D extensions/CiteThisPage
D extensions/Citoid
D extensions/CleanChanges
D extensions/CodeEditor
D extensions/CodeMirror
D extensions/CodeReview
D extensions/Cognate
D extensions/CollaborationKit
D extensions/Collection
D extensions/CommonsMetadata
D extensions/ConfirmEdit
D extensions/ContactPage
D extensions/ContentTranslation
D extensions/ContributionTracking
D extensions/CreditsSource
D extensions/Dashiki
D extensions/DisableAccount
D extensions/Disambiguator
D extensions/DismissableSiteNotice
D extensions/DonationInterface
D extensions/DoubleWiki
D extensions/DynamicSidebar
D extensions/Echo
D extensions/EducationProgram
D extensions/Elastica
D extensions/ElectronPdfService
D extensions/EventBus
D extensions/EventLogging
D extensions/ExtensionDistributor
D extensions/FeaturedFeeds
D extensions/FlaggedRevs
D extensions/Flow
D extensions/FundraiserLandingPage
D extensions/FundraisingTranslateWorkflow
D extensions/GWToolset
D extensions/Gadgets
D extensions/GeoCrumbs
D extensions/GeoData
D extensions/GettingStarted
D extensions/GlobalBlocking
D extensions/GlobalCssJs
D extensions/GlobalUsage
D extensions/GlobalUserPage
D extensions/GoogleNewsSitemap
D extensions/Graph
D extensions/GuidedTour
D extensions/ImageMap
D extensions/InputBox
D extensions/Insider
D extensions/Interwiki
D extensions/InterwikiSorting
D extensions/Josa
D extensions/JsonConfig
D extensions/Kartographer
D extensions/LabeledSectionTransclusion
D extensions/LandingCheck
D extensions/LdapAuthentication
D extensions/Linter
D extensions/LiquidThreads
D extensions/Listings
D extensions/LocalisationUpdate
D extensions/LoginNotify
D extensions/MapSources
D extensions/MassMessage
D extensions/Math
D extensions/MobileApp
D extensions/MobileFrontend
D extensions/MultimediaViewer
D extensions/MwEmbedSupport
D extensions/NavigationTiming
D extensions/NewUserMessage
D extensions/Newsletter
D extensions/Nuke
D extensions/OATHAuth
D extensions/OAuth
D extensions/ORES
D extensions/OpenStackManager
D extensions/PageAssessments
D extensions/PageImages
D extensions/PageTriage
D extensions/PageViewInfo
D extensions/PagedTiffHandler
D extensions/ParserFunctions
D extensions/ParserMigration
D extensions/ParsoidBatchAPI
D extensions/PdfHandler
D extensions/Petition
D extensions/Poem
D extensions/PoolCounter
D extensions/Popups
D extensions/ProofreadPage
D extensions/QuickSurveys
D extensions/Quiz
A extensions/README
D extensions/RSS
D extensions/RelatedArticles
D extensions/RelatedSites
D extensions/Renameuser
D extensions/RevisionSlider
D extensions/SandboxLink
D extensions/Score
D extensions/Scribunto
D extensions/SearchExtraNS
D extensions/SecurePoll
D extensions/ShortUrl
D extensions/SiteMatrix
D extensions/SpamBlacklist
D extensions/SubPageList3
D extensions/SubpageSortkey
D extensions/SyntaxHighlight_GeSHi
D extensions/TemplateData
D extensions/TemplateSandbox
D extensions/TemplateStyles
D extensions/TextExtracts
D extensions/Thanks
D extensions/TimedMediaHandler
D extensions/TitleBlacklist
D extensions/TocTree
D extensions/TorBlock
D extensions/Translate
D extensions/TranslationNotifications
D extensions/TrustedXFF
D extensions/TwoColConflict
D extensions/UnicodeConverter
D extensions/UniversalLanguageSelector
D extensions/UploadWizard
D extensions/UploadsLink
D extensions/UrlShortener
D extensions/UserMerge
D extensions/VectorBeta
D extensions/VipsScaler
D extensions/VisualEditor
D extensions/WikiEditor
D extensions/WikiLove
D extensions/Wikidata
D extensions/WikidataPageBanner
D extensions/WikimediaEvents
D extensions/WikimediaIncubator
D extensions/WikimediaMaintenance
D extensions/WikimediaMessages
D extensions/XAnalytics
D extensions/ZeroBanner
D extensions/ZeroPortal
D extensions/cldr
D extensions/intersection
D extensions/timeline
D extensions/wikihiero
M includes/DefaultSettings.php
D skins/CologneBlue
D skins/MinervaNeue
D skins/Modern
D skins/MonoBook
D skins/Nostalgia
D skins/Timeless
D skins/Vector
D vendor
175 files changed, 34 insertions(+), 859 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/376653/1

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Bump ACW"

2017-09-07 Thread MaxSem (Code Review)

Hello Niharika29, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Bump ACW"
..

Revert "Bump ACW"

This reverts commit ea418d268710963c7447c6831e5b5a060fcabaa6.

Change-Id: I8a648bc82709be4f735b5e58a7921d79c98e40c2
---
M extensions/ArticleCreationWorkflow
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/376652/1

diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
index 7ed2ae9..9f970aa 16
--- a/extensions/ArticleCreationWorkflow
+++ b/extensions/ArticleCreationWorkflow
@@ -1 +1 @@
-Subproject commit 7ed2ae91a6677e02f4eb4c0940713be1bb80f447
+Subproject commit 9f970aa1cf89412b10a3abf2a72c6bd434aad5f9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a648bc82709be4f735b5e58a7921d79c98e40c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Clean up new setDesiredLocale

2017-09-07 Thread Mholloway (Code Review)

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

Change subject: Clean up new setDesiredLocale
..

Clean up new setDesiredLocale

I was a bit quick on the draw merging If50de9da: Dmitry is right that
we should avoid recursing in setDesiredLocale.  With our current language
variant handling this shouldn't result in an infinite recursion, but it
could leave us open if things change, and in any case there's no real
benefit I can see to recursing here.

Change-Id: I313294085a489b560a4a585460247af9ecd07651
---
M app/src/main/java/org/wikipedia/util/L10nUtil.java
1 file changed, 27 insertions(+), 19 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index 4609f75..9aa538c 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -6,7 +6,6 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
-import android.text.format.DateUtils;
 import android.util.SparseArray;
 import android.view.View;
 
@@ -15,13 +14,22 @@
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.bridge.CommunicationBridge;
-import org.wikipedia.language.AppLanguageLookUpTable;
 import org.wikipedia.language.LanguageUtil;
 import org.wikipedia.page.PageTitle;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
+
+import static android.text.format.DateUtils.SECOND_IN_MILLIS;
+import static android.text.format.DateUtils.getRelativeTimeSpanString;
+import static java.lang.System.currentTimeMillis;
+import static java.util.Locale.SIMPLIFIED_CHINESE;
+import static java.util.Locale.TRADITIONAL_CHINESE;
+import static 
org.wikipedia.language.AppLanguageLookUpTable.CHINESE_LANGUAGE_CODE;
+import static 
org.wikipedia.language.AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE;
+import static 
org.wikipedia.language.AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE;
+import static org.wikipedia.util.ConfigurationCompat.setLocale;
 
 /**
  * A collection of localization related methods.
@@ -152,12 +160,13 @@
  *
  * See http://stackoverflow.com/a/6380008 (submitted by WMF's own Anomie!).
  */
-private static SparseArray getStringsForLocale(Locale 
targetLocale, @StringRes int[] strings) {
+private static SparseArray getStringsForLocale(@NonNull Locale 
targetLocale,
+   @StringRes int[] 
strings) {
 Configuration config = getCurrentConfiguration();
 Locale systemLocale = ConfigurationCompat.getLocale(config);
 setDesiredLocale(config, targetLocale);
 SparseArray localizedStrings = getTargetStrings(strings, 
config);
-ConfigurationCompat.setLocale(config, systemLocale);
+setLocale(config, systemLocale);
 resetConfiguration(config);
 return localizedStrings;
 }
@@ -193,25 +202,24 @@
  * @return String representing the relative time difference of the 
paramter from current time
  */
 public static String formatDateRelative(Date date) {
-return DateUtils.getRelativeTimeSpanString(date.getTime(), 
System.currentTimeMillis(), DateUtils.SECOND_IN_MILLIS, 0).toString();
+return getRelativeTimeSpanString(date.getTime(), currentTimeMillis(), 
SECOND_IN_MILLIS, 0).toString();
 }
 
-
-public static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
+private static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
 // when loads API in chinese variant, we can get zh-hant, zh-hans and 
zh
-// but if we want to display chinese correctly based on the article 
itself, we have to detect the variant from  the API responses
-// otherwise, we will only get english texts. And this might only 
happen in Chinese variant
-if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE))
 {
-ConfigurationCompat.setLocale(config, Locale.TRADITIONAL_CHINESE);
-} else if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE))
 {
-ConfigurationCompat.setLocale(config, Locale.SIMPLIFIED_CHINESE);
-} else if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.CHINESE_LANGUAGE_CODE)
-&& 
!desiredLocale.getLanguage().equals(WikipediaApp.getInstance().getAppLanguageCode()))
 {
-// create a new Locale object to manage only "zh" language code 
based on its app language code
-// e.g.: search "HK" article in "zh-hant" or "zh-hans" will get 
"zh" language code
-

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[wmf/1.30.0-wmf.17]: Avoid CommentStore errors by selecting correct set of columns

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Avoid CommentStore errors by selecting correct set of columns
..


Avoid CommentStore errors by selecting correct set of columns

Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
---
M includes/Views/AbuseFilterViewExamine.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Views/AbuseFilterViewExamine.php 
b/includes/Views/AbuseFilterViewExamine.php
index ef7b439..3887cf7 100644
--- a/includes/Views/AbuseFilterViewExamine.php
+++ b/includes/Views/AbuseFilterViewExamine.php
@@ -243,7 +243,7 @@
 
$info = [
'tables' => 'recentchanges',
-   'fields' => '*',
+   'fields' => Revision::selectFields(),
'conds' => array_filter( $conds ),
'options' => [ 'ORDER BY' => 'rc_timestamp DESC' ],
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Avoid CommentStore errors by selecting correct set of columns

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Avoid CommentStore errors by selecting correct set of columns
..


Avoid CommentStore errors by selecting correct set of columns

Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
---
M includes/Views/AbuseFilterViewExamine.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Views/AbuseFilterViewExamine.php 
b/includes/Views/AbuseFilterViewExamine.php
index 6c0e77a..e67415b 100644
--- a/includes/Views/AbuseFilterViewExamine.php
+++ b/includes/Views/AbuseFilterViewExamine.php
@@ -248,7 +248,7 @@
 
$info = [
'tables' => 'recentchanges',
-   'fields' => '*',
+   'fields' => Revision::selectFields(),
'conds' => array_filter( $conds ),
'options' => [ 'ORDER BY' => 'rc_timestamp DESC' ],
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix texts in article page show English instead of Chinese

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix texts in article page show English instead of Chinese
..


Fix texts in article page show English instead of Chinese

In this update
  - Add a method to detect the language code from API, and setLocale directly 
if it is in "zh" variant

Bug: T162398
Change-Id: If50de9da3a933f5546f314e4c2558cc92f2f26a1
---
M app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 23 insertions(+), 1 deletion(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java 
b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
index ff45a07..86dc0ec 100644
--- a/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
+++ b/app/src/main/java/org/wikipedia/language/AppLanguageLookUpTable.java
@@ -19,6 +19,7 @@
 public class AppLanguageLookUpTable {
 public static final String SIMPLIFIED_CHINESE_LANGUAGE_CODE = "zh-hans";
 public static final String TRADITIONAL_CHINESE_LANGUAGE_CODE = "zh-hant";
+public static final String CHINESE_LANGUAGE_CODE = "zh";
 public static final String NORWEGIAN_LEGACY_LANGUAGE_CODE = "no";
 public static final String NORWEGIAN_BOKMAL_LANGUAGE_CODE = "nb";
 public static final String FALLBACK_LANGUAGE_CODE = "en"; // Must exist in 
preference_language_keys.
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index 4224bd1..4609f75 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -4,6 +4,7 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.text.format.DateUtils;
 import android.util.SparseArray;
@@ -14,6 +15,7 @@
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.bridge.CommunicationBridge;
+import org.wikipedia.language.AppLanguageLookUpTable;
 import org.wikipedia.language.LanguageUtil;
 import org.wikipedia.page.PageTitle;
 
@@ -153,7 +155,7 @@
 private static SparseArray getStringsForLocale(Locale 
targetLocale, @StringRes int[] strings) {
 Configuration config = getCurrentConfiguration();
 Locale systemLocale = ConfigurationCompat.getLocale(config);
-ConfigurationCompat.setLocale(config, targetLocale);
+setDesiredLocale(config, targetLocale);
 SparseArray localizedStrings = getTargetStrings(strings, 
config);
 ConfigurationCompat.setLocale(config, systemLocale);
 resetConfiguration(config);
@@ -194,6 +196,25 @@
 return DateUtils.getRelativeTimeSpanString(date.getTime(), 
System.currentTimeMillis(), DateUtils.SECOND_IN_MILLIS, 0).toString();
 }
 
+
+public static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
+// when loads API in chinese variant, we can get zh-hant, zh-hans and 
zh
+// but if we want to display chinese correctly based on the article 
itself, we have to detect the variant from  the API responses
+// otherwise, we will only get english texts. And this might only 
happen in Chinese variant
+if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE))
 {
+ConfigurationCompat.setLocale(config, Locale.TRADITIONAL_CHINESE);
+} else if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE))
 {
+ConfigurationCompat.setLocale(config, Locale.SIMPLIFIED_CHINESE);
+} else if 
(desiredLocale.getLanguage().equals(AppLanguageLookUpTable.CHINESE_LANGUAGE_CODE)
+&& 
!desiredLocale.getLanguage().equals(WikipediaApp.getInstance().getAppLanguageCode()))
 {
+// create a new Locale object to manage only "zh" language code 
based on its app language code
+// e.g.: search "HK" article in "zh-hant" or "zh-hans" will get 
"zh" language code
+setDesiredLocale(config, new 
Locale(WikipediaApp.getInstance().getAppLanguageCode()));
+} else {
+ConfigurationCompat.setLocale(config, desiredLocale);
+}
+}
+
 private L10nUtil() {
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If50de9da3a933f5546f314e4c2558cc92f2f26a1
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[wmf/1.30.0-wmf.17]: Avoid CommentStore errors by selecting correct set of columns

2017-09-07 Thread Chad (Code Review)

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

Change subject: Avoid CommentStore errors by selecting correct set of columns
..

Avoid CommentStore errors by selecting correct set of columns

Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
---
M includes/Views/AbuseFilterViewExamine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/50/376650/1

diff --git a/includes/Views/AbuseFilterViewExamine.php 
b/includes/Views/AbuseFilterViewExamine.php
index ef7b439..3887cf7 100644
--- a/includes/Views/AbuseFilterViewExamine.php
+++ b/includes/Views/AbuseFilterViewExamine.php
@@ -243,7 +243,7 @@
 
$info = [
'tables' => 'recentchanges',
-   'fields' => '*',
+   'fields' => Revision::selectFields(),
'conds' => array_filter( $conds ),
'options' => [ 'ORDER BY' => 'rc_timestamp DESC' ],
];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Avoid CommentStore errors by selecting correct set of columns

2017-09-07 Thread Chad (Code Review)

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

Change subject: Avoid CommentStore errors by selecting correct set of columns
..

Avoid CommentStore errors by selecting correct set of columns

Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
---
M includes/Views/AbuseFilterViewExamine.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/Views/AbuseFilterViewExamine.php 
b/includes/Views/AbuseFilterViewExamine.php
index 6c0e77a..e67415b 100644
--- a/includes/Views/AbuseFilterViewExamine.php
+++ b/includes/Views/AbuseFilterViewExamine.php
@@ -248,7 +248,7 @@
 
$info = [
'tables' => 'recentchanges',
-   'fields' => '*',
+   'fields' => Revision::selectFields(),
'conds' => array_filter( $conds ),
'options' => [ 'ORDER BY' => 'rc_timestamp DESC' ],
];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d83a45fbf86dc0144d50e8b6258b97f1b0c7188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Use consistent close icon

2017-09-07 Thread VolkerE (Code Review)

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

Change subject: Use consistent close icon
..

Use consistent close icon

Using close icon of WikimediaUI icon collection, which is also
already in use by OOUI.

Bug: T50067
Bug: T175295
Change-Id: I83e435a7215708c5a5eae77eeca29632ed64f608
---
M resources/css/ext.uls.languagesettings.less
M resources/images/close.png
M resources/images/close.svg
3 files changed, 9 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/48/376648/1

diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 41a88e5..974316d 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -142,11 +142,10 @@
 }
 
 .uls-icon-close {
-   background: transparent url( ../images/close.png ) no-repeat scroll 
center center;
-   background-image: -webkit-linear-gradient( transparent, transparent ), 
url( ../images/close.svg );
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/close.svg );
+   background: transparent no-repeat center center;
+   .background-image-svg( '../images/close.svg', '../images/close.png' );
+   background-size: 16px 16px; // Support: Android Browser <= 4.3, doesn't 
accept it as part of `background` shorthand
float: right;
-   padding: 15px;
+   padding: 16px;
cursor: pointer;
 }
diff --git a/resources/images/close.png b/resources/images/close.png
index 84631c3..80dde95 100644
--- a/resources/images/close.png
+++ b/resources/images/close.png
Binary files differ
diff --git a/resources/images/close.svg b/resources/images/close.svg
index b39a0ff..7f75511 100644
--- a/resources/images/close.svg
+++ b/resources/images/close.svg
@@ -1 +1,5 @@
-http://www.w3.org/2000/svg; 
width="13.592" height="13.592">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 
20">
+   
+   
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83e435a7215708c5a5eae77eeca29632ed64f608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[REL1_28]: Improve WhoIsWatching extension

2017-09-07 Thread MarkAHershberger (Code Review)

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

Change subject: Improve WhoIsWatching extension
..

Improve WhoIsWatching extension

* Use extension.json
* Add rights so that we can use those instead of globals to control
  access:
  * addpagetoanywatchlist: gets to use the special page to add users.
  * seepagewatchers: gets to see the watchers.
* Clean up WhoIsWatching::execute() method:
  * Use fewer globals.  Use GlobalVarConfig where possible.
  * Use protected methods for various parts of the execution path.
  * Add stub (WhoIsWatching::eNotifUser()) to later notify editors when
their watchlists are changed.
  * Add stub (WhoIsWatching::uiNotifyUser()) to later provide better
feedback to users of this extension.
  * Instead of listing out every user to choose from, provide
autocomplete for user selection.
  * Instead of showing a confusing "usage" message, provide an
autocomplete input box so that the user can select a page to
inspect.
  * Provide slightly better error messages.
  * Refactor to make code more readable.
* Adapted to changes in core MediaWiki:
  * Remove .i18n.php stub.
  * Moved $wgPageShowWatchingUsers which was removed from core in 1.25
to $whoiswathing_showwatchingusers
  * Since the message had to be changed anyway, moved the message from
number_of_watching_users_pageview to whoiswatchingpageview
* Remove use of sprintf for i18n construction.

Change-Id: I9474771788bbeecbbfa521cfbe1792524d04d301
(cherry picked from commit dcd0aad156785b00a799ef45b185778da58b95fb)
(cherry picked from commit e5015a5ff822d2099be95f121afe630a81c0a69a)
---
A ChangeLog
A ChangeLog.mediawiki
D WhoIsWatching.i18n.php
M WhoIsWatching.php
M WhoIsWatching_body.php
A extension.json
M i18n/en.json
M i18n/qqq.json
8 files changed, 343 insertions(+), 163 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhoIsWatching 
refs/changes/47/376647/1

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..8fba8eb
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,28 @@
+Changes since 0.11:
+
+
+Incompatibilites:
+* Requires at least MediaWiki 1.26
+* If you've made changes to the message displayed at the bottom of the page in 
[[MediaWiki:number_of_watching_users_pageview]], you'll need to see if it 
matches what is in [[MediaWiki:whoiswatchingpageview]] on your wiki.
+* Note the use of permissions is preferred to globals to allow access to the 
Special Page
+
+
+Other Changes:
+* Use extension.json
+* Remove .i18n.php stub.
+* Add rights so that we can use those instead of globals to control access:
+** addpagetoanywatchlist: gets to use the special page to add users.
+** seepagewatchers: gets to see the watchers.
+* Clean up WhoIsWatching::execute() method:
+** Use fewer globals.  Use GlobalVarConfig where possible.
+** Use protected methods for various parts of the execution path.
+** Add stub (WhoIsWatching::eNotifUser()) to later notify editors when their 
watchlists are changed.
+** Add stub (WhoIsWatching::uiNotifyUser()) to later provide better feedback 
to users of this extension.
+** Instead of listing out every user to choose from, provide autocomplete for 
user selection.
+** Instead of showing a confusing "usage" message, provide an autocomplete 
input box so that the user can select a page to inspect.
+** Provide slightly better error messages.
+** Refactor to make code more readable.
+* Adapted to changes in core MediaWiki since 1.25:
+** Moved $wgPageShowWatchingUsers which was removed from core in 1.25 to 
$whoiswathing_showwatchingusers
+** Since the message had to be changed anyway, moved the message from 
number_of_watching_users_pageview to whoiswatchingpageview
+* Remove use of sprintf for i18n construction.
diff --git a/ChangeLog.mediawiki b/ChangeLog.mediawiki
new file mode 12
index 000..b0936e8
--- /dev/null
+++ b/ChangeLog.mediawiki
@@ -0,0 +1 @@
+ChangeLog
\ No newline at end of file
diff --git a/WhoIsWatching.i18n.php b/WhoIsWatching.i18n.php
deleted file mode 100644
index 6df9df6..000
--- a/WhoIsWatching.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim6c3b7e8be40a26ae' ) ) {
-   function wfJsonI18nShim6c3b7e8be40a26ae( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Prioritize the secondary link, so it shows (without needing ...

2017-09-07 Thread Mattflaschen (Code Review)

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

Change subject: Prioritize the secondary link, so it shows (without needing ... 
menu)
..

Prioritize the secondary link, so it shows (without needing ... menu)

Bug: T174927
Change-Id: I8650a336a06440cc233622c6496a1594b9fbe03a
---
M includes/Echo/EchoNewsletterPresentationModel.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/46/376646/1

diff --git a/includes/Echo/EchoNewsletterPresentationModel.php 
b/includes/Echo/EchoNewsletterPresentationModel.php
index b5fd6fb..b7ed667 100644
--- a/includes/Echo/EchoNewsletterPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPresentationModel.php
@@ -25,7 +25,8 @@
return [
[
'url' => $this->getNewsletterUrl(),
-   'label' => $this->msg( 
'newsletter-notification-link-text-view-newsletter' )
+   'label' => $this->msg( 
'newsletter-notification-link-text-view-newsletter' ),
+   'prioritized' => true,
],
];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8650a336a06440cc233622c6496a1594b9fbe03a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Index statements on items

2017-09-07 Thread Smalyshev (Code Review)

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

Change subject: [WIP] Index statements on items
..

[WIP] Index statements on items

Statements are indexed in the field 'statements' and are represented
as 'property:value' e.g. P31:Q4167410.

Bug: T175199
Change-Id: I880808d70ed5350d39c81e1f41560dccfd982d00
---
M repo/config/Wikibase.default.php
M repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php
M repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php
A repo/includes/Search/Elastic/Fields/StatementProviderFieldDefinitions.php
A repo/includes/Search/Elastic/Fields/StatementsField.php
M repo/includes/WikibaseRepo.php
6 files changed, 187 insertions(+), 9 deletions(-)


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

diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 12a48ff..1b54b78 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -253,4 +253,7 @@
// Rescore profiles, loaded by Wikibase.php
'rescoreProfiles' => [],
],
+
+// List of properties to be indexed
+'indexedProperties' => []
 ];
diff --git a/repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php 
b/repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php
index 8e9edb5..9e60e1c 100644
--- a/repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php
+++ b/repo/includes/Search/Elastic/Fields/ItemFieldDefinitions.php
@@ -16,12 +16,19 @@
 */
private $descriptionsProviderFieldDefinitions;
 
+   /**
+* @var StatementProviderFieldDefinitions
+*/
+   private $statementProviderFieldDefinitions;
+
public function __construct(
LabelsProviderFieldDefinitions $labelsProviderFieldDefinitions,
-   DescriptionsProviderFieldDefinitions 
$descriptionsProviderFieldDefinitions
+   DescriptionsProviderFieldDefinitions 
$descriptionsProviderFieldDefinitions,
+   StatementProviderFieldDefinitions 
$statementProviderFieldDefinitions
) {
$this->labelsProviderFieldDefinitions = 
$labelsProviderFieldDefinitions;
$this->descriptionsProviderFieldDefinitions = 
$descriptionsProviderFieldDefinitions;
+   $this->statementProviderFieldDefinitions = 
$statementProviderFieldDefinitions;
}
 
/**
@@ -37,11 +44,11 @@
 */
$fields = array_merge(
$this->labelsProviderFieldDefinitions->getFields(),
-   $this->descriptionsProviderFieldDefinitions->getFields()
+   
$this->descriptionsProviderFieldDefinitions->getFields(),
+   $this->statementProviderFieldDefinitions->getFields()
);
 
$fields['sitelink_count'] = new SiteLinkCountField();
-   $fields['statement_count'] = new StatementCountField();
 
return $fields;
}
diff --git a/repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php 
b/repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php
index 1d2e760..0db6a14 100644
--- a/repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php
+++ b/repo/includes/Search/Elastic/Fields/PropertyFieldDefinitions.php
@@ -16,12 +16,19 @@
 */
private $descriptionsProviderFieldDefinitions;
 
+   /**
+* @var StatementProviderFieldDefinitions
+*/
+   private $statementProviderFieldDefinitions;
+
public function __construct(
LabelsProviderFieldDefinitions $labelsProviderFieldDefinitions,
-   DescriptionsProviderFieldDefinitions 
$descriptionsProviderFieldDefinitions
+   DescriptionsProviderFieldDefinitions 
$descriptionsProviderFieldDefinitions,
+   StatementProviderFieldDefinitions 
$statementProviderFieldDefinitions
) {
$this->labelsProviderFieldDefinitions = 
$labelsProviderFieldDefinitions;
$this->descriptionsProviderFieldDefinitions = 
$descriptionsProviderFieldDefinitions;
+   $this->statementProviderFieldDefinitions = 
$statementProviderFieldDefinitions;
}
 
/**
@@ -32,14 +39,14 @@
 * Properties have:
 * - labels
 * - descriptions
+* - statements
 * - statement count
 */
$fields = array_merge(
$this->labelsProviderFieldDefinitions->getFields(),
-   $this->descriptionsProviderFieldDefinitions->getFields()
+   
$this->descriptionsProviderFieldDefinitions->getFields(),
+   $this->statementProviderFieldDefinitions->getFields()
);
-
-

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix interpretation of 'prioritized'

2017-09-07 Thread Mattflaschen (Code Review)

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

Change subject: Fix interpretation of 'prioritized'
..

Fix interpretation of 'prioritized'

Docs (especially in EventPresentationModel.php) say true means outside
the menu, false inside.

However, it was interpreting any value as true.

Change-Id: Icb438538e5c588c1ac7d4bbac0b762dd07057199
---
M modules/ui/mw.echo.ui.NotificationItemWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ui/mw.echo.ui.NotificationItemWidget.js
index 475b695..9dbebae 100644
--- a/modules/ui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationItemWidget.js
@@ -130,7 +130,7 @@
// prioritized explicitly, *except* for items inside a 
bundle
// (where all actions are inside the menu) or there are 
more than
// two prioritized actions (all others go into the menu)
-   isOutsideMenu = !this.bundle && urlObj.prioritized !== 
undefined && outsideMenuItemCounter < mw.echo.config.maxPrioritizedActions;
+   isOutsideMenu = !this.bundle && urlObj.prioritized && 
outsideMenuItemCounter < mw.echo.config.maxPrioritizedActions;
 
linkButton = new mw.echo.ui.MenuItemWidget( {
type: urlObj.type,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb438538e5c588c1ac7d4bbac0b762dd07057199
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into HEAD

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into HEAD
..


Merge branch 'master' into HEAD

3fb7292 Enable PHPCS, but only with rules phpcbf could fix
b3ec09a Fix PayPal Gateway Tagging
ca24a80 Only run phpunit when the config file is present

Change-Id: I22eab3eb0939183294f36c4d65d92bdf0c34fc9d
---
D PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
D PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
D PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/RequeueMessageTest.php
D PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
D PaymentProviders/Ingenico/Tests/phpunit/HostedCheckoutProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IngenicoPaymentProviderTest.php
D PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
D PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
D PaymentProviders/PayPal/Tests/Data/refund_other.json
D PaymentProviders/PayPal/Tests/Data/refund_other_transformed.json
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
D Tests/BaseSmashPigUnitTestCase.php
D Tests/FileDumperTest.php
D Tests/PaymentsInitialDatabaseTest.php
D Tests/PendingDatabaseTest.php
D Tests/PendingQueueConsumerTest.php
D Tests/SmashPigDatabaseTest.php
D Tests/bootstrap-phpunit.php
M composer.json
22 files changed, 0 insertions(+), 1,620 deletions(-)

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



diff --git a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php 
b/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
deleted file mode 100644
index 6d0eecd..000
--- a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-returnCode = $returnCode;
-   }
-
-   public function setAccount( $account ) {
-   $this->account = $account;
-   }
-
-   /**
-* Fakes a Capture modification to a given Adyen transaction.
-*
-* @param string $currency Original currency of the request
-* @param int $amount Amount to be captured. Less than or equal to the 
original request
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function capture( $currency, $amount, $pspReference ) {
-   $this->captured[] = array(
-   'currency' => $currency,
-   'amount' => $amount,
-   'pspReference' => $pspReference,
-   );
-   return $this->returnCode;
-   }
-
-   /**
-* Pretends to cancel an Adyen authorization
-*
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function cancel( $pspReference ) {
-   $this->cancelled[] = $pspReference;
-   return $this->returnCode;
-   }
-}
->>> BRANCH (ca24a8 Only run phpunit when the config file is present)
diff --git a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
deleted file mode 100644
index 1ba8a0b..000
--- a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-pendingDatabase = PendingDatabase::get();
-   $this->pendingMessage = json_decode(
-   file_get_contents( __DIR__ . '/../Data/pending.json' ), 
true
-   );
-   $this->pendingDatabase->storeMessage( $this->pendingMessage );
-   $this->antifraudQueue = QueueWrapper::getQueue( 
'payments-antifraud' );
-   }
-
-   public function tearDown() {
-   $this->pendingDatabase->deleteMessage( $this->pendingMessage );
-   parent::tearDown();
-   }
-
-   /**
-* For a legit donation, ProcessCaptureJob should leave donor data
-* in the pending database, add an antifraud message, and return true.
-*/
-   public function testSuccessfulCapture() {
-   $api = $this->config->object( 'api', true );
-
-   $auth = JsonSerializableObject::fromJsonProxy(
-   
'SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Authorisation',
-   file_get_contents( __DIR__ . '/../Data/auth.json' )
-   );
-
-   $job = ProcessCaptureRequestJob::factory( $auth );
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into HEAD

2017-09-07 Thread XenoRyet (Code Review)

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

Change subject: Merge branch 'master' into HEAD
..

Merge branch 'master' into HEAD

3fb7292 Enable PHPCS, but only with rules phpcbf could fix
b3ec09a Fix PayPal Gateway Tagging
ca24a80 Only run phpunit when the config file is present

Change-Id: I22eab3eb0939183294f36c4d65d92bdf0c34fc9d
---
D PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
D PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
D PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/RequeueMessageTest.php
D PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
D PaymentProviders/Ingenico/Tests/phpunit/HostedCheckoutProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IngenicoPaymentProviderTest.php
D PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
D PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
D PaymentProviders/PayPal/Tests/Data/refund_other.json
D PaymentProviders/PayPal/Tests/Data/refund_other_transformed.json
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
D Tests/BaseSmashPigUnitTestCase.php
D Tests/FileDumperTest.php
D Tests/PaymentsInitialDatabaseTest.php
D Tests/PendingDatabaseTest.php
D Tests/PendingQueueConsumerTest.php
D Tests/SmashPigDatabaseTest.php
D Tests/bootstrap-phpunit.php
M composer.json
22 files changed, 0 insertions(+), 1,620 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/43/376643/1

diff --git a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php 
b/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
deleted file mode 100644
index 6d0eecd..000
--- a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-returnCode = $returnCode;
-   }
-
-   public function setAccount( $account ) {
-   $this->account = $account;
-   }
-
-   /**
-* Fakes a Capture modification to a given Adyen transaction.
-*
-* @param string $currency Original currency of the request
-* @param int $amount Amount to be captured. Less than or equal to the 
original request
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function capture( $currency, $amount, $pspReference ) {
-   $this->captured[] = array(
-   'currency' => $currency,
-   'amount' => $amount,
-   'pspReference' => $pspReference,
-   );
-   return $this->returnCode;
-   }
-
-   /**
-* Pretends to cancel an Adyen authorization
-*
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function cancel( $pspReference ) {
-   $this->cancelled[] = $pspReference;
-   return $this->returnCode;
-   }
-}
->>> BRANCH (ca24a8 Only run phpunit when the config file is present)
diff --git a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
deleted file mode 100644
index 1ba8a0b..000
--- a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-pendingDatabase = PendingDatabase::get();
-   $this->pendingMessage = json_decode(
-   file_get_contents( __DIR__ . '/../Data/pending.json' ), 
true
-   );
-   $this->pendingDatabase->storeMessage( $this->pendingMessage );
-   $this->antifraudQueue = QueueWrapper::getQueue( 
'payments-antifraud' );
-   }
-
-   public function tearDown() {
-   $this->pendingDatabase->deleteMessage( $this->pendingMessage );
-   parent::tearDown();
-   }
-
-   /**
-* For a legit donation, ProcessCaptureJob should leave donor data
-* in the pending database, add an antifraud message, and return true.
-*/
-   public function testSuccessfulCapture() {
-   $api = $this->config->object( 'api', true );
-
-   $auth = JsonSerializableObject::fromJsonProxy(
-   
'SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Authorisation',
-   file_get_contents( __DIR__ . '/../Data/auth.json' )
-   );
-
-   $job = ProcessCaptureRequestJob::factory( $auth );
-

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Only run phpunit when the config file is present

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Only run phpunit when the config file is present
..


Only run phpunit when the config file is present

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

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



diff --git a/composer.json b/composer.json
index a5359ea..6e7f8b6 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpunit",
+   "[ ! -f phpunit.xml ] || phpunit",
"phpcs -p -s"
]
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86a20e9cfe4d4a18da43739068110d16785b877a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
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[master]: Only run phpunit when the config file is present

2017-09-07 Thread Ejegg (Code Review)

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

Change subject: Only run phpunit when the config file is present
..

Only run phpunit when the config file is present

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/42/376642/1

diff --git a/composer.json b/composer.json
index a5359ea..6e7f8b6 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpunit",
+   "[ ! -f phpunit.xml ] || phpunit",
"phpcs -p -s"
]
},

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryLinks: Remove index forcing

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: ApiQueryLinks: Remove index forcing
..


ApiQueryLinks: Remove index forcing

Appears to have been added for T16102, which has hopefully been fixed
since. Let's try it and see if queries break.

Bug: T162774
Change-Id: If60442b9c8856b80a071ed9df830f9a3397218c9
---
M includes/api/ApiQueryLinks.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index d29a763..4b34091 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -137,7 +137,6 @@
 
$order[] = $this->prefix . '_title' . $sort;
$this->addOption( 'ORDER BY', $order );
-   $this->addOption( 'USE INDEX', [ $this->table => 'PRIMARY' ] );
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$res = $this->select( __METHOD__ );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If60442b9c8856b80a071ed9df830f9a3397218c9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: create user account for Rita Ho (rho)

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: admins: create user account for Rita Ho (rho)
..

admins: create user account for Rita Ho (rho)

Create shell account for Rita Ho.

purpose:
review analytics data for the Wikipedia Android app
from SWAP notebooks

https://phabricator.wikimedia.org/p/RHo/
https://www.mediawiki.org/wiki/User:RHo_(WMF)

Addition into groups has to be done in a seperate patch,
so this just creates the account without giving it access yet.

UID matches existing LDAP user, cn: Rho, rho@wikimedia

Key as provided on Phabricator ticket.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/376641/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 40b1e84..7bf66ac 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2562,6 +2562,15 @@
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCrRP96tPtNAw4XAiTdDaxbwfDIwN5c4rCg3vArfDQSqOutIICgY30CGC1nadOmEqJxqAn6xQYnMgA94qb3pyPln/DLYtcseE185UHvqNqbOpXT+a9EnV/o1uHPP0/riQHF5k27SBUZS6RyAj14JkgbTutz5Z35aYfULTmhP3yMTdhd+/Fl3rA7d+bZdZCLwiikwJ0DY1dKXmSCKalFAub/FVjEGLpSLGu2gkKufx6sm4W+U0nBku9tLxBJ3B/rJdXVoudeAM3NWBJErPEqvyv3SYTnxthGIuqI9ZayjtzVNuuK5eETxdFVMwoxV1V/AvtqgSHxa9Tr1aTMkZZ8IdmP
 dbarr...@wikimedia.org
 uid: 17204
 email: dbarr...@wikimedia.org
+  rho:
+ensure: present
+gid: 500
+name: rho
+realname: Rita Ho
+ssh_keys:
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5IHuPUUK0SGl+S/G6jiCd1UWOZ/abghr4qEqNepM06kpV 
rho@Ritas-MBP
+uid: 14485
+email: r...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add cron to purge old mediawiki data snapshots

2017-09-07 Thread Nuria (Code Review)

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

Change subject: Add cron to purge old mediawiki data snapshots
..

Add cron to purge old mediawiki data snapshots

Companion change needs to be merged: https://gerrit.wikimedia.org/r/#/c/355601/7

Bug: T162034
Change-Id: I8ae4104bfea7f99c3270527d63598b7d63a34a94
---
M modules/role/manifests/analytics_cluster/refinery/job/data_drop.pp
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/376640/1

diff --git a/modules/role/manifests/analytics_cluster/refinery/job/data_drop.pp 
b/modules/role/manifests/analytics_cluster/refinery/job/data_drop.pp
index 9fd888c..aef5d8c 100644
--- a/modules/role/manifests/analytics_cluster/refinery/job/data_drop.pp
+++ b/modules/role/manifests/analytics_cluster/refinery/job/data_drop.pp
@@ -10,6 +10,7 @@
 $wdqs_extract_log_file = 
"${role::analytics_cluster::refinery::log_dir}/drop-wdqs-extract-partitions.log"
 $mediawiki_log_file= 
"${role::analytics_cluster::refinery::log_dir}/drop-mediawiki-log-partitions.log"
 $druid_webrequest_log_file = 
"${role::analytics_cluster::refinery::log_dir}/drop-druid-webrequest.log"
+$mediawiki_history_log_file = 
"${role::analytics_cluster::refinery::log_dir}/drop-mediawiki-history.log"
 
 # Shortcut var to DRY up cron commands.
 $env = "export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics_cluster::refinery::path}/python"
@@ -82,4 +83,15 @@
 minute  => '15',
 hour=> '5'
 }
+
+# keep this many mediawiki history snapshots, 6 minimum
+$keep_snapshots = 6
+cron {'mediawiki_history-drop-snapshot':
+command => "${env} && 
${role::analytics_cluster::refinery::path}/bin/refinery-drop-mediawiki-snapshots
 -s ${keep_snapshots} >> ${$mediawiki_history_log_file}",
+environment => "MAILTO=${mail_to}",
+user=> 'hdfs',
+minute  => '15',
+hour=> '5'
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bump ACW

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Bump ACW
..


Bump ACW

Change-Id: I3c88a2242f7fc738da2f952dca0f5e4639959aa9
---
M extensions/ArticleCreationWorkflow
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
index 9f970aa..7ed2ae9 16
--- a/extensions/ArticleCreationWorkflow
+++ b/extensions/ArticleCreationWorkflow
@@ -1 +1 @@
-Subproject commit 9f970aa1cf89412b10a3abf2a72c6bd434aad5f9
+Subproject commit 7ed2ae91a6677e02f4eb4c0940713be1bb80f447

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c88a2242f7fc738da2f952dca0f5e4639959aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Niharika29 
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]: Bump ACW

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: Bump ACW
..

Bump ACW

Change-Id: I3c88a2242f7fc738da2f952dca0f5e4639959aa9
---
M extensions/ArticleCreationWorkflow
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/376639/1

diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
index 9f970aa..7ed2ae9 16
--- a/extensions/ArticleCreationWorkflow
+++ b/extensions/ArticleCreationWorkflow
@@ -1 +1 @@
-Subproject commit 9f970aa1cf89412b10a3abf2a72c6bd434aad5f9
+Subproject commit 7ed2ae91a6677e02f4eb4c0940713be1bb80f447

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[wmf/1.30.0-wmf.17]: Skip the landing page for redlinks completely and take user ...

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Skip the landing page for redlinks completely and take user to 
AfC
..


Skip the landing page for redlinks completely and take user to AfC

Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
(cherry picked from commit 7e0294e284fc6d9c4a1ca7698c8bad41d0a0fbab)
---
M extension.json
M includes/Hooks.php
2 files changed, 32 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
-   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..08e8b2d 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
 
 use EditPage;
 use MediaWiki\MediaWikiServices;
+use Article;
 
 /**
  * Hook handlers
@@ -11,7 +12,7 @@
 class Hooks {
/**
 * AlternateEdit hook handler
-* Redirects users attempting to create pages to Special:CreatePage, 
based on configuration
+* Redirects users attempting to create pages to the landing page, 
based on configuration
 *
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/AlternateEdit
 *
@@ -38,4 +39,32 @@
 
return true;
}
+
+   /**
+* ShowMissingArticle hook handler
+* If article doesn't exist, redirect non-autoconfirmed users to  AfC
+*
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/ShowMissingArticle
+*
+* @param Article $article Article instance
+* @return bool
+*/
+   public static function onShowMissingArticle( Article $article ) {
+   $config = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig( 'ArticleCreationWorkflow' );
+   $workflow = new Workflow( $config );
+   $editPage = new EditPage( $article );
+   if ( $workflow->shouldInterceptEditPage( $editPage ) &&
+   !$editPage->getContext()->getUser()->isAnon()
+   ) {
+   $title = $editPage->getTitle();
+   // If the landing page didn't exist, we wouldn't have 
intercepted.
+   $redirTo = $workflow->getLandingPageTitle();
+   $output = $editPage->getContext()->getOutput();
+   $output->redirect( $redirTo->getFullURL(
+   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   ) );
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Niharika29 
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...ArticleCreationWorkflow[wmf/1.30.0-wmf.17]: Skip the landing page for redlinks completely and take user ...

2017-09-07 Thread Niharika29 (Code Review)

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

Change subject: Skip the landing page for redlinks completely and take user to 
AfC
..

Skip the landing page for redlinks completely and take user to AfC

Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
(cherry picked from commit 7e0294e284fc6d9c4a1ca7698c8bad41d0a0fbab)
---
M extension.json
M includes/Hooks.php
2 files changed, 32 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/38/376638/1

diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
-   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..08e8b2d 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
 
 use EditPage;
 use MediaWiki\MediaWikiServices;
+use Article;
 
 /**
  * Hook handlers
@@ -11,7 +12,7 @@
 class Hooks {
/**
 * AlternateEdit hook handler
-* Redirects users attempting to create pages to Special:CreatePage, 
based on configuration
+* Redirects users attempting to create pages to the landing page, 
based on configuration
 *
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/AlternateEdit
 *
@@ -38,4 +39,32 @@
 
return true;
}
+
+   /**
+* ShowMissingArticle hook handler
+* If article doesn't exist, redirect non-autoconfirmed users to  AfC
+*
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/ShowMissingArticle
+*
+* @param Article $article Article instance
+* @return bool
+*/
+   public static function onShowMissingArticle( Article $article ) {
+   $config = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig( 'ArticleCreationWorkflow' );
+   $workflow = new Workflow( $config );
+   $editPage = new EditPage( $article );
+   if ( $workflow->shouldInterceptEditPage( $editPage ) &&
+   !$editPage->getContext()->getUser()->isAnon()
+   ) {
+   $title = $editPage->getTitle();
+   // If the landing page didn't exist, we wouldn't have 
intercepted.
+   $redirTo = $workflow->getLandingPageTitle();
+   $output = $editPage->getContext()->getOutput();
+   $output->redirect( $redirTo->getFullURL(
+   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   ) );
+   }
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into HEAD

2017-09-07 Thread XenoRyet (Code Review)

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

Change subject: Merge branch 'master' into HEAD
..

Merge branch 'master' into HEAD

3fb7292 Enable PHPCS, but only with rules phpcbf could fix
b3ec09a Fix PayPal Gateway Tagging

Change-Id: I2a0361beb6bc08f64a59a5cb5492bd0468cf8d01
---
D PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
D PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
D PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
D PaymentProviders/Adyen/Tests/phpunit/RequeueMessageTest.php
D PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
D PaymentProviders/Ingenico/Tests/phpunit/HostedCheckoutProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
D PaymentProviders/Ingenico/Tests/phpunit/IngenicoPaymentProviderTest.php
D PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
D PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
D PaymentProviders/PayPal/Tests/Data/refund_other.json
D PaymentProviders/PayPal/Tests/Data/refund_other_transformed.json
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
D Tests/BaseSmashPigUnitTestCase.php
D Tests/FileDumperTest.php
D Tests/PaymentsInitialDatabaseTest.php
D Tests/PendingDatabaseTest.php
D Tests/PendingQueueConsumerTest.php
D Tests/SmashPigDatabaseTest.php
D Tests/bootstrap-phpunit.php
M composer.json
22 files changed, 0 insertions(+), 1,620 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/37/376637/1

diff --git a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php 
b/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
deleted file mode 100644
index b338c51..000
--- a/PaymentProviders/Adyen/Tests/MockAdyenPaymentsAPI.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-returnCode = $returnCode;
-   }
-
-   public function setAccount( $account ) {
-   $this->account = $account;
-   }
-
-   /**
-* Fakes a Capture modification to a given Adyen transaction.
-*
-* @param string $currency Original currency of the request
-* @param int $amount Amount to be captured. Less than or equal to the 
original request
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function capture( $currency, $amount, $pspReference ) {
-   $this->captured[] = array(
-   'currency' => $currency,
-   'amount' => $amount,
-   'pspReference' => $pspReference,
-   );
-   return $this->returnCode;
-   }
-
-   /**
-* Pretends to cancel an Adyen authorization
-*
-* @param string $pspReference Original pspReference of the request
-*
-* @returns bool|string The return code set in the constructor.
-*/
-   public function cancel( $pspReference ) {
-   $this->cancelled[] = $pspReference;
-   return $this->returnCode;
-   }
-}
->>> BRANCH (b3ec09 Fix PayPal Gateway Tagging)
diff --git a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
deleted file mode 100644
index 7e91e2c..000
--- a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<<< HEAD   (8eb98c Merge branch 'master' into deployment)
-===
-pendingDatabase = PendingDatabase::get();
-   $this->pendingMessage = json_decode(
-   file_get_contents( __DIR__ . '/../Data/pending.json' ), 
true
-   );
-   $this->pendingDatabase->storeMessage( $this->pendingMessage );
-   $this->antifraudQueue = QueueWrapper::getQueue( 
'payments-antifraud' );
-   }
-
-   public function tearDown() {
-   $this->pendingDatabase->deleteMessage( $this->pendingMessage );
-   parent::tearDown();
-   }
-
-   /**
-* For a legit donation, ProcessCaptureJob should leave donor data
-* in the pending database, add an antifraud message, and return true.
-*/
-   public function testSuccessfulCapture() {
-   $api = $this->config->object( 'api', true );
-
-   $auth = JsonSerializableObject::fromJsonProxy(
-   
'SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Authorisation',
-   file_get_contents( __DIR__ . '/../Data/auth.json' )
-   );
-
-   $job = ProcessCaptureRequestJob::factory( $auth );
-   $this->assertTrue( $job->execute() );
-
-   $donorData =

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use core's OrderedStreamingForkController.

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Use core's OrderedStreamingForkController.
..


Use core's OrderedStreamingForkController.

Now that OrderedStreamingForkController has been moved to core
we can use it and not local copy.

Change-Id: I4eb3b0ac320525b426682feee9cf4c53df2f008e
---
M autoload.php
D includes/Maintenance/OrderedStreamingForkController.php
M maintenance/runSearch.php
3 files changed, 1 insertion(+), 211 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 2e72740..a061bb7 100644
--- a/autoload.php
+++ b/autoload.php
@@ -89,7 +89,6 @@
'CirrusSearch\\Maintenance\\MappingConfigBuilder' => __DIR__ . 
'/includes/Maintenance/MappingConfigBuilder.php',
'CirrusSearch\\Maintenance\\MetaStoreIndex' => __DIR__ . 
'/includes/Maintenance/MetaStoreIndex.php',
'CirrusSearch\\Maintenance\\Metastore' => __DIR__ . 
'/maintenance/metastore.php',
-   'CirrusSearch\\Maintenance\\OrderedStreamingForkController' => __DIR__ 
. '/includes/Maintenance/OrderedStreamingForkController.php',
'CirrusSearch\\Maintenance\\Reindexer' => __DIR__ . 
'/includes/Maintenance/Reindexer.php',
'CirrusSearch\\Maintenance\\RunSearch' => __DIR__ . 
'/maintenance/runSearch.php',
'CirrusSearch\\Maintenance\\SaneitizeJobs' => __DIR__ . 
'/maintenance/saneitizeJobs.php',
diff --git a/includes/Maintenance/OrderedStreamingForkController.php 
b/includes/Maintenance/OrderedStreamingForkController.php
deleted file mode 100644
index 97347dd..000
--- a/includes/Maintenance/OrderedStreamingForkController.php
+++ /dev/null
@@ -1,210 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- */
-class OrderedStreamingForkController extends \ForkController {
-   /** @var callable */
-   protected $workCallback;
-   /** @var resource */
-   protected $input;
-   /** @var resource */
-   protected $output;
-   /** @var int */
-   protected $nextOutputId;
-   /** @var string[] Int key indicates order, value is data */
-   protected $delayedOutputData = [];
-
-   /**
-* @param int $numProcs The number of worker processes to fork
-* @param callable $workCallback A callback to call in the child process
-*  once for each line of work to process.
-* @param resource $input A socket to read work lines from
-* @param resource $output A socket to write the result of work to.
-*/
-   public function __construct( $numProcs, $workCallback, $input, $output 
) {
-   parent::__construct( $numProcs );
-   $this->workCallback = $workCallback;
-   $this->input = $input;
-   $this->output = $output;
-   }
-
-   /**
-* {@inheritDoc}
-*/
-   public function start() {
-   if ( $this->procsToStart > 0 ) {
-   $status = parent::start();
-   if ( $status === 'child' ) {
-   $this->consume();
-   }
-   } else {
-   $status = 'parent';
-   $this->consumeNoFork();
-   }
-   return $status;
-   }
-
-   /**
-* @param int $numProcs
-* @return string
-*/
-   protected function forkWorkers( $numProcs ) {
-   $this->prepareEnvironment();
-
-   $childSockets = [];
-   // Create the child processes
-   for ( $i = 0; $i < $numProcs; $i++ ) {
-   $sockets = stream_socket_pair( STREAM_PF_UNIX, 
STREAM_SOCK_STREAM, STREAM_IPPROTO_IP );
-   // Do the fork
-   $pid = pcntl_fork();
-   if ( $pid === -1 || $pid === false ) {
-   echo "Error creating child processes\n";
-   exit( 1 );
-   }
-
-   if ( !$pid ) {
-   $this->initChild();
-   $this->childNumber = $i;
-   $this->input = $sockets[0];
-   $this->output = $sockets[0];
-   fclose( $sockets[1] );
-   return 'child';
-   } else {
-   // This is the parent process
-   $this->children[$pid] = true;
-   fclose( $sockets[0] );
-   $childSockets[] = $sockets[1];
-   }
-   }
-   $this->feedChildren( $childSockets );
-   foreach ( $childSockets as

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/base: turn screen monitoring into a WARN-only check

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: icinga/base: turn screen monitoring into a WARN-only check
..

icinga/base: turn screen monitoring into a WARN-only check

The plugin does have separate -w and -c threshold settings,
(currently set to 8 and 48 hours respectively in I2abbf90f5334b2730).

So we could just set -c to a _very_ high value to achieve nearly the
same, but if we say we never want this check to be a CRIT and always
just a WARN, we can also change it like here and just return WARN
even when return code from the generic function is 2.

So we should do this if we say the check should NEVER really be CRIT,
even when there are really old screens and we have the whitelisting by
host. Otherwise, we don't really need it.

Bug: T165348
Change-Id: I7f97fe04281616a0abe57dea5283eca802b8b4d8
---
M modules/base/files/monitoring/check_long_procs
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/376636/1

diff --git a/modules/base/files/monitoring/check_long_procs 
b/modules/base/files/monitoring/check_long_procs
index 20fe11b..22cf51b 100755
--- a/modules/base/files/monitoring/check_long_procs
+++ b/modules/base/files/monitoring/check_long_procs
@@ -93,13 +93,13 @@
 run_time_tmux=$(echo $result_tmux | cut -d, -f3)
 
 if [ $return_code_screen -eq 2 ]; then
-echo "CRIT: Long running SCREEN process. (PID: ${pid_screen}, 
${run_time_screen}s > ${crit_seconds}s)."
-exit 2
+echo "WARN: Long running SCREEN process. (PID: ${pid_screen}, 
${run_time_screen}s > ${crit_seconds}s)."
+exit 1
 fi
 
 if [ $return_code_tmux -eq 2 ]; then
-echo "CRIT: Long running tmux process. (PID: ${pid_tmux}, 
${run_time_tmux}s > ${crit_seconds}s)."
-exit 2
+echo "WARN: Long running tmux process. (PID: ${pid_tmux}, 
${run_time_tmux}s > ${crit_seconds}s)."
+exit 1
 fi
 
 if [ $return_code_screen -eq 1 ]; then

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group2 to wmf.17

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: group2 to wmf.17
..


group2 to wmf.17

Change-Id: Ibc4c3ebe48231f7406fa999e3b25f6878e60656c
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 9969715..82dfbbf 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.16",
+"aawiki": "php-1.30.0-wmf.17",
 "aawikibooks": "php-1.30.0-wmf.17",
 "aawiktionary": "php-1.30.0-wmf.17",
-"abwiki": "php-1.30.0-wmf.16",
+"abwiki": "php-1.30.0-wmf.17",
 "abwiktionary": "php-1.30.0-wmf.17",
-"acewiki": "php-1.30.0-wmf.16",
+"acewiki": "php-1.30.0-wmf.17",
 "advisorywiki": "php-1.30.0-wmf.17",
-"adywiki": "php-1.30.0-wmf.16",
-"afwiki": "php-1.30.0-wmf.16",
+"adywiki": "php-1.30.0-wmf.17",
+"afwiki": "php-1.30.0-wmf.17",
 "afwikibooks": "php-1.30.0-wmf.17",
 "afwikiquote": "php-1.30.0-wmf.17",
 "afwiktionary": "php-1.30.0-wmf.17",
-"akwiki": "php-1.30.0-wmf.16",
+"akwiki": "php-1.30.0-wmf.17",
 "akwikibooks": "php-1.30.0-wmf.17",
 "akwiktionary": "php-1.30.0-wmf.17",
-"alswiki": "php-1.30.0-wmf.16",
+"alswiki": "php-1.30.0-wmf.17",
 "alswikibooks": "php-1.30.0-wmf.17",
 "alswikiquote": "php-1.30.0-wmf.17",
 "alswiktionary": "php-1.30.0-wmf.17",
-"amwiki": "php-1.30.0-wmf.16",
+"amwiki": "php-1.30.0-wmf.17",
 "amwikiquote": "php-1.30.0-wmf.17",
 "amwiktionary": "php-1.30.0-wmf.17",
-"angwiki": "php-1.30.0-wmf.16",
+"angwiki": "php-1.30.0-wmf.17",
 "angwikibooks": "php-1.30.0-wmf.17",
 "angwikiquote": "php-1.30.0-wmf.17",
 "angwikisource": "php-1.30.0-wmf.17",
 "angwiktionary": "php-1.30.0-wmf.17",
-"anwiki": "php-1.30.0-wmf.16",
+"anwiki": "php-1.30.0-wmf.17",
 "anwiktionary": "php-1.30.0-wmf.17",
-"arbcom_cswiki": "php-1.30.0-wmf.16",
-"arbcom_dewiki": "php-1.30.0-wmf.16",
-"arbcom_enwiki": "php-1.30.0-wmf.16",
-"arbcom_fiwiki": "php-1.30.0-wmf.16",
-"arbcom_nlwiki": "php-1.30.0-wmf.16",
-"arcwiki": "php-1.30.0-wmf.16",
-"arwiki": "php-1.30.0-wmf.16",
+"arbcom_cswiki": "php-1.30.0-wmf.17",
+"arbcom_dewiki": "php-1.30.0-wmf.17",
+"arbcom_enwiki": "php-1.30.0-wmf.17",
+"arbcom_fiwiki": "php-1.30.0-wmf.17",
+"arbcom_nlwiki": "php-1.30.0-wmf.17",
+"arcwiki": "php-1.30.0-wmf.17",
+"arwiki": "php-1.30.0-wmf.17",
 "arwikibooks": "php-1.30.0-wmf.17",
 "arwikimedia": "php-1.30.0-wmf.17",
 "arwikinews": "php-1.30.0-wmf.17",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.17",
 "arwikiversity": "php-1.30.0-wmf.17",
 "arwiktionary": "php-1.30.0-wmf.17",
-"arzwiki": "php-1.30.0-wmf.16",
-"astwiki": "php-1.30.0-wmf.16",
+"arzwiki": "php-1.30.0-wmf.17",
+"astwiki": "php-1.30.0-wmf.17",
 "astwikibooks": "php-1.30.0-wmf.17",
 "astwikiquote": "php-1.30.0-wmf.17",
 "astwiktionary": "php-1.30.0-wmf.17",
-"aswiki": "php-1.30.0-wmf.16",
+"aswiki": "php-1.30.0-wmf.17",
 "aswikibooks": "php-1.30.0-wmf.17",
 "aswikisource": "php-1.30.0-wmf.17",
 "aswiktionary": "php-1.30.0-wmf.17",
-"atjwiki": "php-1.30.0-wmf.16",
+"atjwiki": "php-1.30.0-wmf.17",
 "auditcomwiki": "php-1.30.0-wmf.17",
-"avwiki": "php-1.30.0-wmf.16",
+"avwiki": "php-1.30.0-wmf.17",
 "avwiktionary": "php-1.30.0-wmf.17",
-"aywiki": "php-1.30.0-wmf.16",
+"aywiki": "php-1.30.0-wmf.17",
 "aywikibooks": "php-1.30.0-wmf.17",
 "aywiktionary": "php-1.30.0-wmf.17",
-"azbwiki": "php-1.30.0-wmf.16",
-"azwiki": "php-1.30.0-wmf.16",
+"azbwiki": "php-1.30.0-wmf.17",
+"azwiki": "php-1.30.0-wmf.17",
 "azwikibooks": "php-1.30.0-wmf.17",
 "azwikiquote": "php-1.30.0-wmf.17",
 "azwikisource": "php-1.30.0-wmf.17",
 "azwiktionary": "php-1.30.0-wmf.17",
-"barwiki": "php-1.30.0-wmf.16",
-"bat_smgwiki": "php-1.30.0-wmf.16",
-"bawiki": "php-1.30.0-wmf.16",
+"barwiki": "php-1.30.0-wmf.17",
+"bat_smgwiki": "php-1.30.0-wmf.17",
+"bawiki": "php-1.30.0-wmf.17",
 "bawikibooks": "php-1.30.0-wmf.17",
-"bclwiki": "php-1.30.0-wmf.16",
+"bclwiki": "php-1.30.0-wmf.17",
 "bdwikimedia": "php-1.30.0-wmf.17",
-"be_x_oldwiki": "php-1.30.0-wmf.16",
+"be_x_oldwiki": "php-1.30.0-wmf.17",
 "betawikiversity": "php-1.30.0-wmf.17",
-"bewiki": "php-1.30.0-wmf.16",
+"bewiki": "php-1.30.0-wmf.17",
 "bewikibooks": "php-1.30.0-wmf.17",
 "bewikimedia": "php-1.30.0-wmf.17",
 "bewikiquote": "php-1.30.0-wmf.17",
 "bewikisource": "php-1.30.0-wmf.17",
 "bewiktionary": "php-1.30.0-wmf.17",
-"bgwiki": "php-1.30.0-wmf.16",
+"bgwiki": "php-1.30.0-wmf.17",

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Skip the landing page for redlinks completely and take user ...

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Skip the landing page for redlinks completely and take user to 
AfC
..


Skip the landing page for redlinks completely and take user to AfC

Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
---
M extension.json
M includes/Hooks.php
2 files changed, 32 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
-   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..08e8b2d 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
 
 use EditPage;
 use MediaWiki\MediaWikiServices;
+use Article;
 
 /**
  * Hook handlers
@@ -11,7 +12,7 @@
 class Hooks {
/**
 * AlternateEdit hook handler
-* Redirects users attempting to create pages to Special:CreatePage, 
based on configuration
+* Redirects users attempting to create pages to the landing page, 
based on configuration
 *
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/AlternateEdit
 *
@@ -38,4 +39,32 @@
 
return true;
}
+
+   /**
+* ShowMissingArticle hook handler
+* If article doesn't exist, redirect non-autoconfirmed users to  AfC
+*
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/ShowMissingArticle
+*
+* @param Article $article Article instance
+* @return bool
+*/
+   public static function onShowMissingArticle( Article $article ) {
+   $config = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig( 'ArticleCreationWorkflow' );
+   $workflow = new Workflow( $config );
+   $editPage = new EditPage( $article );
+   if ( $workflow->shouldInterceptEditPage( $editPage ) &&
+   !$editPage->getContext()->getUser()->isAnon()
+   ) {
+   $title = $editPage->getTitle();
+   // If the landing page didn't exist, we wouldn't have 
intercepted.
+   $redirTo = $workflow->getLandingPageTitle();
+   $output = $editPage->getContext()->getOutput();
+   $output->redirect( $redirTo->getFullURL(
+   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   ) );
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Limit CX dashboard width

2017-09-07 Thread Petar.petkovic (Code Review)

Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376629 )

Change subject: Limit CX dashboard width
..

Limit CX dashboard width

- Add maximum width for CX dashboard to avoid
stretching too much on wide screens.
- Rearrange CSS selectors and media queries
towards more mobile-first design.

Bug: T175004
Change-Id: Ic134ef9a16b4fc51c7af4447bf09446220a24074
---
M modules/dashboard/ext.cx.dashboard.js
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/widgets/translator/ext.cx.translator.less
3 files changed, 49 insertions(+), 26 deletions(-)


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

diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index 1b6cf7b..74dfdf7 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -27,7 +27,6 @@
this.$listHeader = null;
this.$sourceSelector = null;
this.narrowLimit = 700;
-   this.wideLimit = 1200;
this.isNarrowScreenSize = false;
 
this.filterLabels = {};
@@ -418,7 +417,7 @@
CXDashboard.prototype.scroll = function () {
var scrollTop = $( window ).scrollTop();
 
-   if ( this.wideLimit && scrollTop > 0 ) {
+   if ( scrollTop > 0 ) {
this.$sidebar.addClass( 'sticky' );
} else {
this.$sidebar.removeClass( 'sticky' );
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index 8f8b962..cea58ae 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -16,6 +16,7 @@
 // Container for list of items in dashboard has padding equal to following 
variable value.
 // Following variable is also used to align sticky header with container
 @translationlist-container-padding-right: 10px;
+@maximum-dashboard-width: 1500px;
 
 body {
background-color: @colorGray14;
@@ -23,28 +24,42 @@
 
 .cx-dashboard {
color: @gray-darker;
+   max-width: @maximum-dashboard-width;
+   margin: 0 auto;
padding: 20px @dashboard-horizontal-padding;
 }
 
 .cx-dashboard-sidebar {
-   .mw-ui-one-third;
+   .mw-ui-one-whole;
 
-   padding: 0 0 0 20px;
-   line-height: 1;
margin-bottom: 48px;
-
-   @media only screen and ( max-width: @wide ) {
-   .mw-ui-one-whole;
-
-   padding: 0;
-   }
+   padding: 0;
+   line-height: 1;
 
@media only screen and ( min-width: @wide ) {
-   &.sticky {
+   .mw-ui-one-third;
+
+   padding: 0 0 0 20px;
+   }
+
+   @media only screen and ( min-width: @maximum-dashboard-width ) {
+   max-width: @maximum-dashboard-width / 3;
+   }
+
+   &.sticky {
+   @media only screen and ( min-width: @wide ) {
position: fixed;
top: @sticky-header-height;
right: @sticky-sidebar-right-position;
padding-right: @sticky-sidebar-width-adjustment;
+   }
+
+   // This assumes @maximum-dashboard-width is bigger than @wide
+   @media only screen and ( min-width: @maximum-dashboard-width ) {
+   right: auto;
+   left: 50%;
+   margin-left: @maximum-dashboard-width / 6;
+   padding-right: 0;
}
}
 
@@ -102,7 +117,7 @@
.box-shadow-card;
font-size: 16px;
 
-   @media only screen and ( min-width: @narrow ) and ( max-width: 
@wide ) {
+   @media only screen and ( min-width: @narrow ) and ( max-width: 
( @wide - 1px ) ) {
width: 47.5%;
margin-left: 5%;
}
@@ -131,15 +146,17 @@
 }
 
 .cx-translationlist-container {
-   .mw-ui-two-thirds;
+   .mw-ui-one-whole;
 
background-color: @colorGray14;
margin-bottom: 48px;
-   padding: 0 @translationlist-container-padding-right 0 0;
+   padding: 0;
 
-   @media only screen and ( max-width: @wide ) {
-   .mw-ui-one-whole;
-   padding: 0;
+   @media only screen and ( min-width: @wide ) {
+   .mw-ui-two-thirds;
+   // This is needed so sidebar doesn't wiggle
+   width: 66.667%;
+   padding: 0 @translationlist-container-padding-right 0 0;
}
 }
 
@@ -161,14 +178,21 @@
// .cx-tlitem__actions__trigger has a zindex of 100 and the ULS from 
language filters
// has a z-index of 1000. So a number in between is chosen.
z-index: 200;
-   width:

[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "mwext-testextension-php55-composer to jessie"

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "mwext-testextension-php55-composer to jessie"
..


Revert "mwext-testextension-php55-composer to jessie"

Forgot to deploy it :(

This reverts commit 12462dfa0f581db27b102665f661c865e43baa43.

Change-Id: I8f37d537eef5a465a76ba5cff4fa23689d5e6b23
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 263eabb..89977b6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -953,13 +953,14 @@
  - mwgate-php55lint
  - mwext-testextension-hhvm-composer-jessie
 php5:
- - mwext-testextension-php55-composer-jessie
+ - mwext-testextension-php55-composer-trusty
 gate-and-submit: 
  - mwgate-php55lint
- - mwext-testextension-php55-composer-jessie
+ - mwext-testextension-php55-composer-trusty
  - mwext-testextension-hhvm-composer-jessie
 gate-and-submit-swat: *extension-unittests-composer-gate-and-submit
 experimental:
+ - mwext-testextension-php55-composer-jessie
  - mwext-qunit-composer-jessie
  - mwgate-npm-node-6-jessie
  - mwgate-composer-php70-jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f37d537eef5a465a76ba5cff4fa23689d5e6b23
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "mwext-testextension-php55-composer to jessie"

2017-09-07 Thread Hashar (Code Review)

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "mwext-testextension-php55-composer to jessie"
..

Revert "mwext-testextension-php55-composer to jessie"

Forgot to deploy it :(

This reverts commit 12462dfa0f581db27b102665f661c865e43baa43.

Change-Id: I8f37d537eef5a465a76ba5cff4fa23689d5e6b23
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/376623/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 263eabb..89977b6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -953,13 +953,14 @@
  - mwgate-php55lint
  - mwext-testextension-hhvm-composer-jessie
 php5:
- - mwext-testextension-php55-composer-jessie
+ - mwext-testextension-php55-composer-trusty
 gate-and-submit: 
  - mwgate-php55lint
- - mwext-testextension-php55-composer-jessie
+ - mwext-testextension-php55-composer-trusty
  - mwext-testextension-hhvm-composer-jessie
 gate-and-submit-swat: *extension-unittests-composer-gate-and-submit
 experimental:
+ - mwext-testextension-php55-composer-jessie
  - mwext-qunit-composer-jessie
  - mwgate-npm-node-6-jessie
  - mwgate-composer-php70-jessie

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f37d537eef5a465a76ba5cff4fa23689d5e6b23
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Minimise dependencies, and make toolbar tweaks

2017-09-07 Thread Esanders (Code Review)

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

Change subject: Minimise dependencies, and make toolbar tweaks
..

Minimise dependencies, and make toolbar tweaks

Change-Id: I37cccd5760b8e65fc4232ca4572147f3b031255d
---
M extension.json
M modules/ve-mw-collab/ve.init.mw.CollabTarget.js
2 files changed, 26 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index fa3cc77..8a7c93e 100644
--- a/extension.json
+++ b/extension.json
@@ -431,12 +431,27 @@
"scripts": [

"modules/ve-mw-collab/ve.init.mw.CollabTarget.js"
],
+   "styles": [
+   
"modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css",
+   
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css"
+   ],
+   "skinStyles": {
+   "vector": [
+   
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css"
+   ],
+   "apex": [
+   
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css"
+   ],
+   "monobook": [
+   
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css"
+   ]
+   },
"dependencies": [
"ext.visualEditor.base",
"ext.visualEditor.mediawiki",
"ext.visualEditor.core.desktop",
"ext.visualEditor.mwextensions.desktop",
-   "ext.visualEditor.desktopArticleTarget"
+   "ext.visualEditor.desktopTarget"
]
},
"ext.visualEditor.collabTarget.init": {
diff --git a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js 
b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
index 327bed5..7d785a8 100644
--- a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
+++ b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
@@ -48,6 +48,14 @@
 ve.init.mw.CollabTarget.static.trackingName = 'collab';
 
 ve.init.mw.CollabTarget.static.actionGroups = [
+   { include: [ 'help' ] },
+   {
+   type: 'list',
+   icon: 'menu',
+   indicator: null,
+   title: ve.msg( 'visualeditor-pagemenu-tooltip' ),
+   include: [ 'changeDirectionality', 'findAndReplace' ]
+   },
{ include: [ 'authorList' ] }
 ];
 
@@ -85,19 +93,19 @@
've-init-mw-desktopArticleTarget-toolbar 
ve-init-mw-desktopArticleTarget-toolbar-open 
ve-init-mw-desktopArticleTarget-toolbar-opened'
);
this.$element.prepend( this.toolbar.$element );
+   this.toolbar.initialize();
 };
 
 /**
  * @inheritdoc
  */
 ve.init.mw.CollabTarget.prototype.setSurface = function ( surface ) {
-   var synchronizer, surfaceView, toolbar;
+   var synchronizer, surfaceView;
 
if ( surface !== this.surface ) {
this.$editableContent.after( surface.$element );
 
surfaceView = surface.getView();
-   toolbar = this.getToolbar();
 
synchronizer = new ve.dm.SurfaceSynchronizer(
surface.getModel(),
@@ -105,7 +113,6 @@
{ server: this.rebaserUrl }
);
 
-   toolbar.initialize();
surfaceView.setSynchronizer( synchronizer );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37cccd5760b8e65fc4232ca4572147f3b031255d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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] mediawiki/core[wmf/1.30.0-wmf.17]: Branch ArticleCreationWorkflow

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Branch ArticleCreationWorkflow
..


Branch ArticleCreationWorkflow

Bug: T175302
Change-Id: Ic3f277a7e8727a188ed4a8bb046928592d137598
---
M .gitmodules
A extensions/ArticleCreationWorkflow
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 7c294f2..9bfb066 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -682,3 +682,6 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.30.0-wmf.17
+[submodule "extensions/ArticleCreationWorkflow"]
+   path = extensions/ArticleCreationWorkflow
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleCreationWorkflow.git
diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
new file mode 16
index 000..9f970aa
--- /dev/null
+++ b/extensions/ArticleCreationWorkflow
@@ -0,0 +1 @@
+Subproject commit 9f970aa1cf89412b10a3abf2a72c6bd434aad5f9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3f277a7e8727a188ed4a8bb046928592d137598
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Niharika29 
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/mediawiki-config[master]: group2 to wmf.17

2017-09-07 Thread Chad (Code Review)

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

Change subject: group2 to wmf.17
..

group2 to wmf.17

Change-Id: Ibc4c3ebe48231f7406fa999e3b25f6878e60656c
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 9969715..82dfbbf 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.16",
+"aawiki": "php-1.30.0-wmf.17",
 "aawikibooks": "php-1.30.0-wmf.17",
 "aawiktionary": "php-1.30.0-wmf.17",
-"abwiki": "php-1.30.0-wmf.16",
+"abwiki": "php-1.30.0-wmf.17",
 "abwiktionary": "php-1.30.0-wmf.17",
-"acewiki": "php-1.30.0-wmf.16",
+"acewiki": "php-1.30.0-wmf.17",
 "advisorywiki": "php-1.30.0-wmf.17",
-"adywiki": "php-1.30.0-wmf.16",
-"afwiki": "php-1.30.0-wmf.16",
+"adywiki": "php-1.30.0-wmf.17",
+"afwiki": "php-1.30.0-wmf.17",
 "afwikibooks": "php-1.30.0-wmf.17",
 "afwikiquote": "php-1.30.0-wmf.17",
 "afwiktionary": "php-1.30.0-wmf.17",
-"akwiki": "php-1.30.0-wmf.16",
+"akwiki": "php-1.30.0-wmf.17",
 "akwikibooks": "php-1.30.0-wmf.17",
 "akwiktionary": "php-1.30.0-wmf.17",
-"alswiki": "php-1.30.0-wmf.16",
+"alswiki": "php-1.30.0-wmf.17",
 "alswikibooks": "php-1.30.0-wmf.17",
 "alswikiquote": "php-1.30.0-wmf.17",
 "alswiktionary": "php-1.30.0-wmf.17",
-"amwiki": "php-1.30.0-wmf.16",
+"amwiki": "php-1.30.0-wmf.17",
 "amwikiquote": "php-1.30.0-wmf.17",
 "amwiktionary": "php-1.30.0-wmf.17",
-"angwiki": "php-1.30.0-wmf.16",
+"angwiki": "php-1.30.0-wmf.17",
 "angwikibooks": "php-1.30.0-wmf.17",
 "angwikiquote": "php-1.30.0-wmf.17",
 "angwikisource": "php-1.30.0-wmf.17",
 "angwiktionary": "php-1.30.0-wmf.17",
-"anwiki": "php-1.30.0-wmf.16",
+"anwiki": "php-1.30.0-wmf.17",
 "anwiktionary": "php-1.30.0-wmf.17",
-"arbcom_cswiki": "php-1.30.0-wmf.16",
-"arbcom_dewiki": "php-1.30.0-wmf.16",
-"arbcom_enwiki": "php-1.30.0-wmf.16",
-"arbcom_fiwiki": "php-1.30.0-wmf.16",
-"arbcom_nlwiki": "php-1.30.0-wmf.16",
-"arcwiki": "php-1.30.0-wmf.16",
-"arwiki": "php-1.30.0-wmf.16",
+"arbcom_cswiki": "php-1.30.0-wmf.17",
+"arbcom_dewiki": "php-1.30.0-wmf.17",
+"arbcom_enwiki": "php-1.30.0-wmf.17",
+"arbcom_fiwiki": "php-1.30.0-wmf.17",
+"arbcom_nlwiki": "php-1.30.0-wmf.17",
+"arcwiki": "php-1.30.0-wmf.17",
+"arwiki": "php-1.30.0-wmf.17",
 "arwikibooks": "php-1.30.0-wmf.17",
 "arwikimedia": "php-1.30.0-wmf.17",
 "arwikinews": "php-1.30.0-wmf.17",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.17",
 "arwikiversity": "php-1.30.0-wmf.17",
 "arwiktionary": "php-1.30.0-wmf.17",
-"arzwiki": "php-1.30.0-wmf.16",
-"astwiki": "php-1.30.0-wmf.16",
+"arzwiki": "php-1.30.0-wmf.17",
+"astwiki": "php-1.30.0-wmf.17",
 "astwikibooks": "php-1.30.0-wmf.17",
 "astwikiquote": "php-1.30.0-wmf.17",
 "astwiktionary": "php-1.30.0-wmf.17",
-"aswiki": "php-1.30.0-wmf.16",
+"aswiki": "php-1.30.0-wmf.17",
 "aswikibooks": "php-1.30.0-wmf.17",
 "aswikisource": "php-1.30.0-wmf.17",
 "aswiktionary": "php-1.30.0-wmf.17",
-"atjwiki": "php-1.30.0-wmf.16",
+"atjwiki": "php-1.30.0-wmf.17",
 "auditcomwiki": "php-1.30.0-wmf.17",
-"avwiki": "php-1.30.0-wmf.16",
+"avwiki": "php-1.30.0-wmf.17",
 "avwiktionary": "php-1.30.0-wmf.17",
-"aywiki": "php-1.30.0-wmf.16",
+"aywiki": "php-1.30.0-wmf.17",
 "aywikibooks": "php-1.30.0-wmf.17",
 "aywiktionary": "php-1.30.0-wmf.17",
-"azbwiki": "php-1.30.0-wmf.16",
-"azwiki": "php-1.30.0-wmf.16",
+"azbwiki": "php-1.30.0-wmf.17",
+"azwiki": "php-1.30.0-wmf.17",
 "azwikibooks": "php-1.30.0-wmf.17",
 "azwikiquote": "php-1.30.0-wmf.17",
 "azwikisource": "php-1.30.0-wmf.17",
 "azwiktionary": "php-1.30.0-wmf.17",
-"barwiki": "php-1.30.0-wmf.16",
-"bat_smgwiki": "php-1.30.0-wmf.16",
-"bawiki": "php-1.30.0-wmf.16",
+"barwiki": "php-1.30.0-wmf.17",
+"bat_smgwiki": "php-1.30.0-wmf.17",
+"bawiki": "php-1.30.0-wmf.17",
 "bawikibooks": "php-1.30.0-wmf.17",
-"bclwiki": "php-1.30.0-wmf.16",
+"bclwiki": "php-1.30.0-wmf.17",
 "bdwikimedia": "php-1.30.0-wmf.17",
-"be_x_oldwiki": "php-1.30.0-wmf.16",
+"be_x_oldwiki": "php-1.30.0-wmf.17",
 "betawikiversity": "php-1.30.0-wmf.17",
-"bewiki": "php-1.30.0-wmf.16",
+"bewiki": "php-1.30.0-wmf.17",
 "bewikibooks": "php-1.30.0-wmf.17",
 "bewikimedia": "php-1.30.0-wmf.17",
 "bewikiquote": "php-1.30.0-wmf.17",
 "bewikisource": "php-1.30.0-wmf.17",
 "bewiktionary": "php-1.30.0-wmf.17",
-"bgwiki": "php-1.30.0-wmf.16",
+"bgwiki": "php-1.30.0-wmf.17",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base/icinga: increase warn/crit thresholds for screen monito...

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: base/icinga: increase warn/crit thresholds for screen monitoring
..


base/icinga: increase warn/crit thresholds for screen monitoring

Instead of 1 and 3 hours respectively, set warn and crit thresholds
for monitoring of "long" running screen and tmux processes to 8
and 48 hours. Per feedback from bblack.

< bblack> maybe something more like 6h?

< bblack> (there's a lot of legit cases for keeping a screen session
up for most of a working day while waiting on system reimages or taking
long log samples for investigation or whatever)

< bblack> but you've got some example alerts up there that are months
< bblack> so there's definitely a need heh

For now, use WARN unless it's longer than 2 days.

Bug: T165348
Change-Id: I2abbf90f5334b2730b12ed2aaf0f2f6421fb4d2a
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index a7bd6c5..39a9d9c 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -165,7 +165,7 @@
 
 ::nrpe::monitor_service { 'check_long_procs':
 description  => 'Long running screen/tmux',
-nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 1 -c 3',
+nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 48',
 }
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2abbf90f5334b2730b12ed2aaf0f2f6421fb4d2a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Jcrespo 
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[wmf/1.30.0-wmf.17]: ApiQueryRecentChanges: Fetch comment fields if rctoken is used

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: ApiQueryRecentChanges: Fetch comment fields if rctoken is used
..


ApiQueryRecentChanges: Fetch comment fields if rctoken is used

When the deprecated rctoken parameter is used, the module calls
RecentChange::newFromRow(), which now requires that the comment fields
be present.

Bug: T175307
Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
(cherry picked from commit 5ec0132821f4dca98a53b466a3d35b7a2853c616)
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 9af4e3e..63e0748 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -287,14 +287,6 @@
);
$showRedirects = $this->fld_redirect || isset( 
$show['redirect'] )
|| isset( $show['!redirect'] );
-
-   if ( $this->fld_comment || $this->fld_parsedcomment ) {
-   $this->commentStore = new CommentStore( 
'rc_comment' );
-   $commentQuery = $this->commentStore->getJoin();
-   $this->addTables( $commentQuery['tables'] );
-   $this->addFields( $commentQuery['fields'] );
-   $this->addJoinConds( $commentQuery['joins'] );
-   }
}
$this->addFieldsIf( [ 'rc_this_oldid' ],
$resultPageSet && $params['generaterevisions'] );
@@ -360,6 +352,15 @@
}
 
$this->token = $params['token'];
+
+   if ( $this->fld_comment || $this->fld_parsedcomment || 
$this->token ) {
+   $this->commentStore = new CommentStore( 'rc_comment' );
+   $commentQuery = $this->commentStore->getJoin();
+   $this->addTables( $commentQuery['tables'] );
+   $this->addFields( $commentQuery['fields'] );
+   $this->addJoinConds( $commentQuery['joins'] );
+   }
+
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$hookData = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ACW on test2

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Enable ACW on test2
..


Enable ACW on test2

Bug: T175302
Change-Id: I1378545410a855b42d95b348ad7d93e72301e5aa
---
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
2 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5f3b52a..3a9dd7b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19396,6 +19396,18 @@
 
 'wmgUseArticleCreationWorkflow' => [
'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true, // T175302
+],
+
+'wgArticleCreationWorkflows' => [
+   'default' => [],
+   'test2wiki' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
 ],
 
 'wmgUseParserMigration' => [
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index db80964..13ee2bc 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -1,6 +1,7 @@
 $IP/extensions/AbuseFilter/extension.json
 $IP/extensions/AntiSpoof/extension.json
 $IP/extensions/ApiFeatureUsage/extension.json
+$IP/extensions/ArticleCreationWorkflow/extension.json
 $IP/extensions/Babel/extension.json
 $IP/extensions/BetaFeatures/extension.json
 $IP/extensions/BounceHandler/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1378545410a855b42d95b348ad7d93e72301e5aa
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Urbanecm 
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...release[master]: Branch ArticleCreationWorkflow in production

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Branch ArticleCreationWorkflow in production
..


Branch ArticleCreationWorkflow in production

Bug: T175302
Change-Id: I5282090eb81c5509c49a8d4eeac8eec4eea9c984
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 585b272..1eab66d 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -4,6 +4,7 @@
"ActiveAbstract",
"AntiSpoof",
"ApiFeatureUsage",
+   "ArticleCreationWorkflow",
"Babel",
"BetaFeatures",
"BounceHandler",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5282090eb81c5509c49a8d4eeac8eec4eea9c984
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cergen[master]: Initial commit of cergen

2017-09-07 Thread Ottomata (Code Review)

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

Change subject: Initial commit of cergen
..

Initial commit of cergen

Wraps python cryptography and PyOpenSSL to provide auto certificate management 
and generation.

Given a yaml manifest of certificates to auto generate, do so!

An Authority is anything that can sign() python cryptography x509 Certificates.
Implement AbstractAuthority.

A Certificate can be an Authority for other Certificates.

CA chains are maintained by parsing the manifest and building a directed graph.
Authorities can return their parent CA chains by following the
chain of parent()s.

TODO:
- tests
- generate other .pem files, including all CA certs from chain?w

Bug: T166167
Change-Id: I0594335367d440744ea0dbdbbce66d9aed680e85
---
A README.md
A cergen/__init__.py
A cergen/authority.py
A cergen/certificate.py
A cergen/key.py
A cergen/main.py
A cergen/manifest.py
A cergen/puppet-sign-cert
A cergen/puppet.py
A cergen/util.py
A examples/example.certs.yaml
A setup.cfg
A setup.py
13 files changed, 2,021 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/cergen refs/changes/92/376592/1

diff --git a/README.md b/README.md
new file mode 100644
index 000..d020d5f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,129 @@
+# cergen
+
+Generates asymmetric keys and x509 certificate files declared in a YAML 
manifest.
+
+x509 certificates can be self signed, signed by other local certificates also 
declared in the
+manifest, or signed by external certificate authorities also declared in the 
manifest and
+implemented as subclasses of AbstractAuthority.
+
+## Usage
+
+```
+Reads in Certificate and external Authority configration manifests and 
generates
+keys and x509 certificate files in various formats.
+
+Usage: cergen [options] 
+
+ is the path to the certificate and authority manifest 
config file(s).
+If this is a directory, then all files that match 
--manifest-glob
+(default '*.certs.yaml') will be loaded as manifests.
+
+Options:
+-h --help   Show this help message and exit.
+
+-c --certificates=   Comma separated list of certificate names 
or regexes to select.
+Without --generate, this will just print 
out certificates statuses
+for these certificates.  With --generate, 
it will attempt to
+generate any missing certificate files for 
these certificates.
+By default all certificates will be 
selected.
+
+-s --subordinates   If given, not only will the certificates 
that match the
+--certificates option be selected, but 
also any of their
+subordinate certificates in the CA chain.
+
+-g --generate   Generate selected certificates and files.
+
+-F --force  If not provied --force, any existing files 
will not be
+overwritten.  If want to overwrite files, 
provide --force.
+
+-m --manifest-glob=   If  is a directory, this 
glob will be used to loaded
+files from that directory. [default: 
*.certs.yaml]
+
+-b --base-path=   Default directory in which generated files 
will be stored.
+[default: ./certificates/certs]
+
+-B --base-private-path=   Default directory in which generated 
private key files
+will be stored.
+[default: ./certificates/private]
+
+-v --verboseTurn on verbose debug logging.
+```
+
+cergen's CLI works with a YAML manifest.  The manifest declares various 
certificate and key
+parameters that are then used to instantiate Certificates and external 
Authorities.  The
+Certificates and Keys can then be generated and stored in local files in 
various formats.
+
+
+### cergen manifest .yaml
+
+The manifest YAML attempts to match the kwargs that can be used to instantiate
+classes.  This allows new subclasses to be created and
+instantiated with manifest configuration without having to write code to
+handle the config -> code instantiation.
+
+A manifest is a dictionary of names to entry kwargs.  The default entry that 
will be
+instantiated is a Certificate.  A Certificate represents a locally stored 
Certificate.
+Other entry types can be instantiated by setting the special 'class' config.
+This should be set to a fully qualified class name that can be loaded from the 
Python path.
+The class name can refer to any class that implements AbstractAuthority.
+The remaining entry kwargs will be passed to the class's constructor.
+
+
+```
+# Common name of this certificate.
+root_ca:
+

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.17]: ApiQueryRecentChanges: Fetch comment fields if rctoken is used

2017-09-07 Thread Chad (Code Review)

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

Change subject: ApiQueryRecentChanges: Fetch comment fields if rctoken is used
..

ApiQueryRecentChanges: Fetch comment fields if rctoken is used

When the deprecated rctoken parameter is used, the module calls
RecentChange::newFromRow(), which now requires that the comment fields
be present.

Bug: T175307
Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
(cherry picked from commit 5ec0132821f4dca98a53b466a3d35b7a2853c616)
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 9 insertions(+), 8 deletions(-)


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

diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 9af4e3e..63e0748 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -287,14 +287,6 @@
);
$showRedirects = $this->fld_redirect || isset( 
$show['redirect'] )
|| isset( $show['!redirect'] );
-
-   if ( $this->fld_comment || $this->fld_parsedcomment ) {
-   $this->commentStore = new CommentStore( 
'rc_comment' );
-   $commentQuery = $this->commentStore->getJoin();
-   $this->addTables( $commentQuery['tables'] );
-   $this->addFields( $commentQuery['fields'] );
-   $this->addJoinConds( $commentQuery['joins'] );
-   }
}
$this->addFieldsIf( [ 'rc_this_oldid' ],
$resultPageSet && $params['generaterevisions'] );
@@ -360,6 +352,15 @@
}
 
$this->token = $params['token'];
+
+   if ( $this->fld_comment || $this->fld_parsedcomment || 
$this->token ) {
+   $this->commentStore = new CommentStore( 'rc_comment' );
+   $commentQuery = $this->commentStore->getJoin();
+   $this->addTables( $commentQuery['tables'] );
+   $this->addFields( $commentQuery['fields'] );
+   $this->addJoinConds( $commentQuery['joins'] );
+   }
+
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$hookData = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 
Gerrit-Reviewer: Anomie 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryRecentChanges: Fetch comment fields if rctoken is used

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: ApiQueryRecentChanges: Fetch comment fields if rctoken is used
..


ApiQueryRecentChanges: Fetch comment fields if rctoken is used

When the deprecated rctoken parameter is used, the module calls
RecentChange::newFromRow(), which now requires that the comment fields
be present.

Bug: T175307
Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 9af4e3e..63e0748 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -287,14 +287,6 @@
);
$showRedirects = $this->fld_redirect || isset( 
$show['redirect'] )
|| isset( $show['!redirect'] );
-
-   if ( $this->fld_comment || $this->fld_parsedcomment ) {
-   $this->commentStore = new CommentStore( 
'rc_comment' );
-   $commentQuery = $this->commentStore->getJoin();
-   $this->addTables( $commentQuery['tables'] );
-   $this->addFields( $commentQuery['fields'] );
-   $this->addJoinConds( $commentQuery['joins'] );
-   }
}
$this->addFieldsIf( [ 'rc_this_oldid' ],
$resultPageSet && $params['generaterevisions'] );
@@ -360,6 +352,15 @@
}
 
$this->token = $params['token'];
+
+   if ( $this->fld_comment || $this->fld_parsedcomment || 
$this->token ) {
+   $this->commentStore = new CommentStore( 'rc_comment' );
+   $commentQuery = $this->commentStore->getJoin();
+   $this->addTables( $commentQuery['tables'] );
+   $this->addFields( $commentQuery['fields'] );
+   $this->addJoinConds( $commentQuery['joins'] );
+   }
+
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$hookData = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base/icinga: increase warn/crit thresholds for screen monito...

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: base/icinga: increase warn/crit thresholds for screen monitoring
..

base/icinga: increase warn/crit thresholds for screen monitoring

Instead of 1 and 3 hours respectively, set warn and crit thresholds
for monitoring of "long" running screen and tmux processes to 8
and 48 hours. Per feedback from bblack.

< bblack> maybe something more like 6h?
< bblack> (there's a lot of legit cases for keeping a screen session up for 
most of a working day while waiting on system reimages or taking long log 
samples for investigation or whatever)
< bblack> but you've got some example alerts up there that are months
< bblack> so there's definitely a need heh

For now, use WARN unless it's longer than 2 days.

Bug: T165348
Change-Id: I2abbf90f5334b2730b12ed2aaf0f2f6421fb4d2a
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index a7bd6c5..39a9d9c 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -165,7 +165,7 @@
 
 ::nrpe::monitor_service { 'check_long_procs':
 description  => 'Long running screen/tmux',
-nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 1 -c 3',
+nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_long_procs -w 8 -c 48',
 }
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add scap3 control files

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Add scap3 control files
..


Add scap3 control files

Add scap.cfg and related control files to enable deployment via scap3
rather than trebuchet.

Bug: T129134
Change-Id: Ibf70cc31bb0dc6e0dce366cdc5b5eb46cbc242e7
---
A scap/checks.yaml
A scap/scap.cfg
A scap/scholarships
3 files changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/scap/checks.yaml b/scap/checks.yaml
new file mode 100644
index 000..53f10d9
--- /dev/null
+++ b/scap/checks.yaml
@@ -0,0 +1,7 @@
+---
+checks:
+  scholarships_responds:
+type: command
+stage: promote
+command: curl -SsI -H 'Host: scholarships.wikimedia.org' 
'http://localhost:80/apply'
+timeout: 10
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..579ad98
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,8 @@
+[global]
+git_repo: scholarships/scholarships
+git_deploy_dir: /srv/deployment
+ssh_user: deploy-service
+server_groups: default
+dsh_targets: scholarships
+batch_size: 1
+max_failures: 1
diff --git a/scap/scholarships b/scap/scholarships
new file mode 100644
index 000..5980db1
--- /dev/null
+++ b/scap/scholarships
@@ -0,0 +1,2 @@
+# Production wikimania-scholarships servers
+krypton.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf70cc31bb0dc6e0dce366cdc5b5eb46cbc242e7
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Thcipriani 
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]: ApiQueryRecentChanges: Fetch comment fields if rctoken is used

2017-09-07 Thread Anomie (Code Review)

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

Change subject: ApiQueryRecentChanges: Fetch comment fields if rctoken is used
..

ApiQueryRecentChanges: Fetch comment fields if rctoken is used

When the deprecated rctoken parameter is used, the module calls
RecentChange::newFromRow(), which now requires that the comment fields
be present.

Bug: T175307
Change-Id: Ida025f419e43809c34fff386f1a1ee8881393b80
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/376589/1

diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 9af4e3e..63e0748 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -287,14 +287,6 @@
);
$showRedirects = $this->fld_redirect || isset( 
$show['redirect'] )
|| isset( $show['!redirect'] );
-
-   if ( $this->fld_comment || $this->fld_parsedcomment ) {
-   $this->commentStore = new CommentStore( 
'rc_comment' );
-   $commentQuery = $this->commentStore->getJoin();
-   $this->addTables( $commentQuery['tables'] );
-   $this->addFields( $commentQuery['fields'] );
-   $this->addJoinConds( $commentQuery['joins'] );
-   }
}
$this->addFieldsIf( [ 'rc_this_oldid' ],
$resultPageSet && $params['generaterevisions'] );
@@ -360,6 +352,15 @@
}
 
$this->token = $params['token'];
+
+   if ( $this->fld_comment || $this->fld_parsedcomment || 
$this->token ) {
+   $this->commentStore = new CommentStore( 'rc_comment' );
+   $commentQuery = $this->commentStore->getJoin();
+   $this->addTables( $commentQuery['tables'] );
+   $this->addFields( $commentQuery['fields'] );
+   $this->addJoinConds( $commentQuery['joins'] );
+   }
+
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$hookData = [];

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix PayPal Gateway Tagging

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix PayPal Gateway Tagging
..


Fix PayPal Gateway Tagging

Former assumptions are no longer true, fixing that.
Also allow for more reason_codes that mean 'refund'.

Bug: T171351
Change-Id: If555903aac93ad8e58da3d2d9e8ea7cb4608b790
---
M PaymentProviders/PayPal/RefundMessage.php
A PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
A PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
A PaymentProviders/PayPal/Tests/Data/refund_other.json
A PaymentProviders/PayPal/Tests/Data/refund_other_transformed.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
6 files changed, 109 insertions(+), 14 deletions(-)

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



diff --git a/PaymentProviders/PayPal/RefundMessage.php 
b/PaymentProviders/PayPal/RefundMessage.php
index 1520594..76a2ce8 100644
--- a/PaymentProviders/PayPal/RefundMessage.php
+++ b/PaymentProviders/PayPal/RefundMessage.php
@@ -10,22 +10,17 @@
if ( isset( $message['txn_type'] ) && $message['txn_type'] === 
'adjustment' ) {
$message['type'] = 'chargeback';
 
-   // For chargebacks, express checkout sets the 'invoice' 
field
-   if ( isset( $ipnMessage['invoice'] ) ) {
-   $message['gateway'] = 'paypal_ec';
-   } else {
-   $message['gateway'] = 'paypal';
-   }
-   } elseif ( isset( $ipnMessage['reason_code'] ) && 
$ipnMessage['reason_code'] === 'refund' ) {
+   } elseif ( isset( $ipnMessage['reason_code'] ) && in_array( 
$ipnMessage['reason_code'], array( 'refund', 'buyer_complaint', 'other' ) ) ) {
$message['type'] = 'refund';
 
-   // For refunds, express checkout puts a description in 
transaction_subject,
-   // but legacy puts a contribution tracking ID there.
-   if ( isset( $ipnMessage['transaction_subject'] ) && 
!is_numeric( $ipnMessage['transaction_subject'] ) ) {
-   $message['gateway'] = 'paypal_ec';
-   } else {
-   $message['gateway'] = 'paypal';
-   }
+   }
+
+   // Express checkout sets the 'invoice' field, legacy doesn't.
+   // EC refunds of recurring payments use 'rp_invoice_id'
+   if ( isset( $ipnMessage['invoice'] ) || isset( 
$ipnMessage['rp_invoice_id'] ) ) {
+   $message['gateway'] = 'paypal_ec';
+   } else {
+   $message['gateway'] = 'paypal';
}
}
 }
diff --git a/PaymentProviders/PayPal/Tests/Data/buyer_complaint.json 
b/PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
new file mode 100644
index 000..30d1a5c
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/buyer_complaint.json
@@ -0,0 +1,37 @@
+{
+  "mc_gross":"-20.00",
+  "invoice":"49020255.1",
+  "protection_eligibility":"Ineligible",
+  "payer_id":"MYBXFQC36JA56",
+  "payment_date":"17:45:02 Aug 29, 2017 PDT",
+  "payment_status":"Refunded",
+  "charset":"UTF-8",
+  "first_name":"Hurgurk",
+  "mc_fee":"-0.84",
+  "notify_version":"3.8",
+  "reason_code":"buyer_complaint",
+  "custom":"49020255",
+  "business":"bl...@wikimedia.org",
+  "verify_sign":"AjStDwheq1BQRze.m1rT996rWsDFAw7YLhmg-SWD0yKsqZg-zQ.xEl4h",
+  "payer_email":"hurg...@blagurk.com",
+  "parent_txn_id":"8RW98769SM297882G",
+  "txn_id":"1V82215816267470S",
+  "payment_type":"instant",
+  "last_name":"Blagurk",
+  "receiver_email":"bl...@wikimedia.org",
+  "payment_fee":"",
+  "shipping_discount":"0.00",
+  "receiver_id":"EZ782AXEUJUW8",
+  "insurance_amount":"0.00",
+  "item_name":"Donation to the Wikimedia Foundation",
+  "discount":"0.00",
+  "mc_currency":"CAD",
+  "item_number":"",
+  "residence_country":"CA",
+  "handling_amount":"0.00",
+  "shipping_method":"Default",
+  "transaction_subject":"Donation to the Wikimedia Foundation",
+  "payment_gross":"",
+  "shipping":"0.00",
+  "ipn_track_id":"3107ceed29692"
+}
\ No newline at end of file
diff --git 
a/PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json 
b/PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
new file mode 100644
index 000..54be9f3
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/buyer_complaint_transformed.json
@@ -0,0 +1,18 @@
+{
+  "date": 1504053902,
+  "gateway_parent_id": "8RW98769SM297882G",
+  "gateway_txn_id": "1V82215816267470S",
+  "currency": "CAD",
+  "type": "refund",
+  "contribution_tracking_id": "49020255",
+  "email": "hurg...@blagurk.com",
+  "first_name": "Hurgurk",
+  "last_name": "Blagurk",
+  "gross": "-20.00",
+  "fee":

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Skip the landing page for redlinks completely and take user ...

2017-09-07 Thread Niharika29 (Code Review)

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

Change subject: Skip the landing page for redlinks completely and take user to 
AfC
..

Skip the landing page for redlinks completely and take user to AfC

Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
---
M extension.json
M includes/Hooks.php
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/88/376588/1

diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
-   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+   "AlternateEdit": 
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+   "ShowMissingArticle": 
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..e122efa 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
 
 use EditPage;
 use MediaWiki\MediaWikiServices;
+use Article;
 
 /**
  * Hook handlers
@@ -38,4 +39,23 @@
 
return true;
}
+
+   public static function onShowMissingArticle( Article $article ) {
+   $config = MediaWikiServices::getInstance()
+   ->getConfigFactory()
+   ->makeConfig( 'ArticleCreationWorkflow' );
+   $workflow = new Workflow( $config );
+   $editPage = new EditPage( $article );
+   if ( $workflow->shouldInterceptEditPage( $editPage ) ) {
+   $title = $editPage->getTitle();
+   // If the landing page didn't exist, we wouldn't have 
intercepted.
+   $redirTo = $workflow->getLandingPageTitle();
+   $output = $editPage->getContext()->getOutput();
+   $output->redirect( $redirTo->getFullURL(
+   [ 'page' => $title->getPrefixedText(), 'wprov' 
=> 'acww1' ]
+   ) );
+   return false;
+   }
+   return true;
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.17]: Branch ArticleCreationWorkflow

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: Branch ArticleCreationWorkflow
..

Branch ArticleCreationWorkflow

Bug: T175302
Change-Id: Ic3f277a7e8727a188ed4a8bb046928592d137598
---
M .gitmodules
A extensions/ArticleCreationWorkflow
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/87/376587/1

diff --git a/.gitmodules b/.gitmodules
index 7c294f2..9bfb066 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -682,3 +682,6 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.30.0-wmf.17
+[submodule "extensions/ArticleCreationWorkflow"]
+   path = extensions/ArticleCreationWorkflow
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleCreationWorkflow.git
diff --git a/extensions/ArticleCreationWorkflow 
b/extensions/ArticleCreationWorkflow
new file mode 16
index 000..9f970aa
--- /dev/null
+++ b/extensions/ArticleCreationWorkflow
@@ -0,0 +1 @@
+Subproject commit 9f970aa1cf89412b10a3abf2a72c6bd434aad5f9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3f277a7e8727a188ed4a8bb046928592d137598
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use core's OrderedStreamingForkController.

2017-09-07 Thread Smalyshev (Code Review)

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

Change subject: Use core's OrderedStreamingForkController.
..

Use core's OrderedStreamingForkController.

Now that OrderedStreamingForkController has been moved to core
we can use it and not local copy.

Change-Id: I4eb3b0ac320525b426682feee9cf4c53df2f008e
---
D includes/Maintenance/OrderedStreamingForkController.php
M maintenance/runSearch.php
2 files changed, 1 insertion(+), 210 deletions(-)


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

diff --git a/includes/Maintenance/OrderedStreamingForkController.php 
b/includes/Maintenance/OrderedStreamingForkController.php
deleted file mode 100644
index 97347dd..000
--- a/includes/Maintenance/OrderedStreamingForkController.php
+++ /dev/null
@@ -1,210 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- */
-class OrderedStreamingForkController extends \ForkController {
-   /** @var callable */
-   protected $workCallback;
-   /** @var resource */
-   protected $input;
-   /** @var resource */
-   protected $output;
-   /** @var int */
-   protected $nextOutputId;
-   /** @var string[] Int key indicates order, value is data */
-   protected $delayedOutputData = [];
-
-   /**
-* @param int $numProcs The number of worker processes to fork
-* @param callable $workCallback A callback to call in the child process
-*  once for each line of work to process.
-* @param resource $input A socket to read work lines from
-* @param resource $output A socket to write the result of work to.
-*/
-   public function __construct( $numProcs, $workCallback, $input, $output 
) {
-   parent::__construct( $numProcs );
-   $this->workCallback = $workCallback;
-   $this->input = $input;
-   $this->output = $output;
-   }
-
-   /**
-* {@inheritDoc}
-*/
-   public function start() {
-   if ( $this->procsToStart > 0 ) {
-   $status = parent::start();
-   if ( $status === 'child' ) {
-   $this->consume();
-   }
-   } else {
-   $status = 'parent';
-   $this->consumeNoFork();
-   }
-   return $status;
-   }
-
-   /**
-* @param int $numProcs
-* @return string
-*/
-   protected function forkWorkers( $numProcs ) {
-   $this->prepareEnvironment();
-
-   $childSockets = [];
-   // Create the child processes
-   for ( $i = 0; $i < $numProcs; $i++ ) {
-   $sockets = stream_socket_pair( STREAM_PF_UNIX, 
STREAM_SOCK_STREAM, STREAM_IPPROTO_IP );
-   // Do the fork
-   $pid = pcntl_fork();
-   if ( $pid === -1 || $pid === false ) {
-   echo "Error creating child processes\n";
-   exit( 1 );
-   }
-
-   if ( !$pid ) {
-   $this->initChild();
-   $this->childNumber = $i;
-   $this->input = $sockets[0];
-   $this->output = $sockets[0];
-   fclose( $sockets[1] );
-   return 'child';
-   } else {
-   // This is the parent process
-   $this->children[$pid] = true;
-   fclose( $sockets[0] );
-   $childSockets[] = $sockets[1];
-   }
-   }
-   $this->feedChildren( $childSockets );
-   foreach ( $childSockets as $socket ) {
-   // if a child has already shutdown the sockets will be 
closed,
-   // closing a second time would raise a warning.
-   if ( is_resource( $socket ) ) {
-   fclose( $socket );
-   }
-   }
-   return 'parent';
-   }
-
-   /**
-* Child worker process. Reads work from $this->input and writes the
-* result of that work to $this->output when completed.
-*/
-   protected function consume() {
-   while ( !feof( $this->input ) ) {
-   $line = trim( fgets( $this->input ) );
-   if ( $line ) {
-   list( $id, $data ) = json_decode( $line );
-   $result = call_user_func( $this->workCallback, 
$data );
-   fwrite( $this->output, json_encode( [

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Add __toString method for PaymentTransactionResponse

2017-09-07 Thread Ejegg (Code Review)

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

Change subject: Add __toString method for PaymentTransactionResponse
..

Add __toString method for PaymentTransactionResponse

There are a lot of useless lines in the logs with

PaymentTransactionResponse Object ( [errors:protected] => Array
( )  [rawResponse:protected] =>  [message:protected] =>
[gatewayTransactionId:protected] =>  [communicationStatus:protected] =>
[data:protected] =>  [forceCancel:protected] =>
[txnMessage:protected] =>  [redirect:protected] =>  )

Change-Id: I4edfe16498204f8c7ad4c631e90b122b51c61476
---
M gateway_common/PaymentTransactionResponse.php
1 file changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/gateway_common/PaymentTransactionResponse.php 
b/gateway_common/PaymentTransactionResponse.php
index f903af8..09a512f 100644
--- a/gateway_common/PaymentTransactionResponse.php
+++ b/gateway_common/PaymentTransactionResponse.php
@@ -192,4 +192,24 @@
public function setRedirect( $redirect ) {
$this->redirect = $redirect;
}
+
+   public function __toString() {
+   $stringVal = "Communication Status: 
'{$this->communicationStatus}', " .
+   "Communication Status: '{$this->communicationStatus}', 
" .
+   "Gateway Txn ID: '{$this->gatewayTransactionId}', " .
+   "Message: '{$this->message}', " .
+   "Txn Message: '{$this->txnMessage}', " .
+   'Data: ' . print_r( $this->data, true ) . ', ' .
+   "Force cancel: '{$this->forceCancel}', " .
+   "Redirect: '{$this->redirect}', " .
+   "Raw response: '{$this->rawResponse}', Errors: ";
+   $errorStrings = [];
+   foreach ( $this->errors as $error ) {
+   if ( $error instanceof PaymentError ) {
+   $errorStrings[] .= ' code ' . 
$error->getErrorCode() .
+   ': ' . $error->getDebugMessage();
+   }
+   }
+   return $stringVal . implode( ';', $errorStrings );
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Branch ArticleCreationWorkflow in production

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: Branch ArticleCreationWorkflow in production
..

Branch ArticleCreationWorkflow in production

Bug: T175302
Change-Id: I5282090eb81c5509c49a8d4eeac8eec4eea9c984
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 585b272..1eab66d 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -4,6 +4,7 @@
"ActiveAbstract",
"AntiSpoof",
"ApiFeatureUsage",
+   "ArticleCreationWorkflow",
"Babel",
"BetaFeatures",
"BounceHandler",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5282090eb81c5509c49a8d4eeac8eec4eea9c984
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ACW on test2

2017-09-07 Thread MaxSem (Code Review)

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

Change subject: Enable ACW on test2
..

Enable ACW on test2

Bug: T175302
Change-Id: I1378545410a855b42d95b348ad7d93e72301e5aa
---
M wmf-config/InitialiseSettings.php
1 file changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5f3b52a..3a9dd7b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19396,6 +19396,18 @@
 
 'wmgUseArticleCreationWorkflow' => [
'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true, // T175302
+],
+
+'wgArticleCreationWorkflows' => [
+   'default' => [],
+   'test2wiki' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
 ],
 
 'wmgUseParserMigration' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWExtensionWindow: clean up originalMwData on teardown

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: MWExtensionWindow: clean up originalMwData on teardown
..


MWExtensionWindow: clean up originalMwData on teardown

Not doing this makes adding a new extension node with the exact same content
as a previously-viewed one have the Done button disabled.

Bug: T172586
Change-Id: I39105144e17135044ef644b5464b0fbfdfc019d5
---
M modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js 
b/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
index 104ee9e..c6451ba 100644
--- a/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
+++ b/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
@@ -114,7 +114,10 @@
  * @inheritdoc OO.ui.Window
  */
 ve.ui.MWExtensionWindow.prototype.getTeardownProcess = function ( data, 
process ) {
-   return process;
+   return process.next( function () {
+   // Don't hold on to the original data, it's only refreshed on 
setup for existing nodes
+   this.originalMwData = null;
+   }, this );
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39105144e17135044ef644b5464b0fbfdfc019d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
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: cleanup keystone references in old module

2017-09-07 Thread Rush (Code Review)

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

Change subject: openstack: cleanup keystone references in old module
..


openstack: cleanup keystone references in old module

Bug: T171494
Change-Id: Ibebb0e4ee6186d642d9ea63e54f04ad624385333
---
D modules/openstack/files/keystone-admin-uwsgi.logrotate
D modules/openstack/files/keystone-public-uwsgi.logrotate
D modules/openstack/files/liberty/keystone/keystone-paste.ini
D modules/openstack/files/liberty/keystone/logging.conf
D modules/openstack/files/liberty/keystone/policy.json
D 
modules/openstack/files/liberty/keystone/wmfkeystoneauth.egg-info/entry_points.txt
D modules/openstack/files/liberty/keystone/wmfkeystoneauth/__init__.py
D modules/openstack/files/liberty/keystone/wmfkeystoneauth/password_whitelist.py
D modules/openstack/files/liberty/keystone/wmfkeystoneauth/wikitechclient.py
D modules/openstack/files/liberty/keystone/wmfkeystoneauth/wmtotp.py
D modules/openstack/files/liberty/keystoneclient/__init__.py
D modules/openstack/files/liberty/keystoneclient/wmtotp.py
D modules/openstack/manifests/keystone/hooks.pp
D modules/openstack/manifests/keystone/service.pp
D modules/openstack/templates/liberty/keystone/keystone.conf.erb
R 
modules/openstack2/files/liberty/keystone/wmfkeystonehooks.egg-info/entry_points.txt
R modules/openstack2/files/liberty/keystone/wmfkeystonehooks/__init__.py
R modules/openstack2/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
R modules/openstack2/files/liberty/keystone/wmfkeystonehooks/pageeditor.py
R modules/openstack2/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
R modules/openstack2/files/monitor/keystone/check_keystone_projects.py
R modules/openstack2/files/monitor/keystone/check_keystone_roles.py
M modules/openstack2/manifests/keystone/hooks.pp
M modules/openstack2/manifests/keystone/monitor.pp
M modules/openstack2/manifests/keystone/service.pp
D modules/role/manifests/labs/openstack/keystone/server.pp
26 files changed, 4 insertions(+), 1,427 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/files/keystone-admin-uwsgi.logrotate 
b/modules/openstack/files/keystone-admin-uwsgi.logrotate
deleted file mode 100644
index ad9a1b4..000
--- a/modules/openstack/files/keystone-admin-uwsgi.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/designate/keystone-admin-uwsgi.log {
-daily
-missingok
-compress
-delaycompress
-notifempty
-copytruncate
-}
diff --git a/modules/openstack/files/keystone-public-uwsgi.logrotate 
b/modules/openstack/files/keystone-public-uwsgi.logrotate
deleted file mode 100644
index 7766a2b..000
--- a/modules/openstack/files/keystone-public-uwsgi.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/designate/keystone-public-uwsgi.log {
-daily
-missingok
-compress
-delaycompress
-notifempty
-copytruncate
-}
diff --git a/modules/openstack/files/liberty/keystone/keystone-paste.ini 
b/modules/openstack/files/liberty/keystone/keystone-paste.ini
deleted file mode 100644
index 0792f42..000
--- a/modules/openstack/files/liberty/keystone/keystone-paste.ini
+++ /dev/null
@@ -1,103 +0,0 @@
-# Keystone PasteDeploy configuration file.
-
-[filter:debug]
-use = egg:keystone#debug
-
-[filter:request_id]
-use = egg:keystone#request_id
-
-[filter:build_auth_context]
-use = egg:keystone#build_auth_context
-
-[filter:token_auth]
-use = egg:keystone#token_auth
-
-[filter:admin_token_auth]
-use = egg:keystone#admin_token_auth
-
-[filter:json_body]
-use = egg:keystone#json_body
-
-[filter:user_crud_extension]
-use = egg:keystone#user_crud_extension
-
-[filter:crud_extension]
-use = egg:keystone#crud_extension
-
-[filter:ec2_extension]
-use = egg:keystone#ec2_extension
-
-[filter:ec2_extension_v3]
-use = egg:keystone#ec2_extension_v3
-
-[filter:federation_extension]
-use = egg:keystone#federation_extension
-
-[filter:oauth1_extension]
-use = egg:keystone#oauth1_extension
-
-[filter:s3_extension]
-use = egg:keystone#s3_extension
-
-[filter:endpoint_filter_extension]
-use = egg:keystone#endpoint_filter_extension
-
-[filter:simple_cert_extension]
-use = egg:keystone#simple_cert_extension
-
-[filter:revoke_extension]
-use = egg:keystone#revoke_extension
-
-[filter:url_normalize]
-use = egg:keystone#url_normalize
-
-[filter:sizelimit]
-use = egg:keystone#sizelimit
-
-[app:public_service]
-use = egg:keystone#public_service
-
-[app:service_v3]
-use = egg:keystone#service_v3
-
-[app:admin_service]
-use = egg:keystone#admin_service
-
-[pipeline:public_api]
-# The last item in this pipeline must be public_service or an equivalent
-# application. It cannot be a filter.
-pipeline = sizelimit url_normalize request_id build_auth_context token_auth 
json_body ec2_extension user_crud_extension public_service
-
-[pipeline:admin_api]

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow extensions to override the print url

2017-09-07 Thread Jdlrobson (Code Review)

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

Change subject: Allow extensions to override the print url
..

Allow extensions to override the print url

Example usage:
Checkout I07f90c9e98c324c1773c233cb2bca9085dec70b5
$wgPrintSourceFunction = 'ShortUrlHooks::getShortURL'

Bug: T172902
Change-Id: I9232084e049a08ab4221633a446e7c78b2f50bdc
---
M includes/DefaultSettings.php
M includes/skins/Skin.php
2 files changed, 26 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/376581/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf3e569..43f0bf6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8771,6 +8771,14 @@
 $wgCommentTableSchemaMigrationStage = MIGRATION_OLD;
 
 /**
+ * When the wiki is running behind a proxy and this is set to true, assumes 
that the proxy exposes
+ * the wiki on the standard ports (443 for https and 80 for http).
+ * @var bool
+ * @since 1.30
+ */
+$wgPrintSourceFunction = 'Skin::getPrintSourceURL';
+
+/**
  * For really cool vim folding this needs to be at the end:
  * vim: foldmarker=@{,@} foldmethod=marker
  * @}
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index e1d0034..6b36526 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -648,6 +648,21 @@
}
 
/**
+* Return the URL to show in the printed version of the page
+*
+* @return string url for printed version
+*/
+   public static function getPrintSourceURL( $title, $oldid ) {
+   if ( $oldid ) {
+   $canonicalUrl = $title->getCanonicalURL( 'oldid=' . 
$oldid );
+   return htmlspecialchars( wfExpandIRI( $canonicalUrl ) );
+   } else {
+   // oldid not available for non existing pages
+   return htmlspecialchars( wfExpandIRI( 
$title->getCanonicalURL() ) );
+   }
+   }
+
+   /**
 * Text with the permalink to the source page,
 * usually shown on the footer of a printed page
 *
@@ -655,13 +670,9 @@
 */
function printSource() {
$oldid = $this->getRevisionId();
-   if ( $oldid ) {
-   $canonicalUrl = $this->getTitle()->getCanonicalURL( 
'oldid=' . $oldid );
-   $url = htmlspecialchars( wfExpandIRI( $canonicalUrl ) );
-   } else {
-   // oldid not available for non existing pages
-   $url = htmlspecialchars( wfExpandIRI( 
$this->getTitle()->getCanonicalURL() ) );
-   }
+   $config = $this->getConfig();
+   $printSourceFunction = $config->get( 'PrintSourceFunction', 
'Skin::getPrintSourceURL' );
+   $url = call_user_func( $printSourceFunction, $this->getTitle(), 
$oldid );
 
return $this->msg( 'retrievedfrom' )
->rawParams( '' . $url 
. '' )

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ShortUrl[master]: Refactor ShortUrl to allow it to be used in printed version

2017-09-07 Thread Jdlrobson (Code Review)

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

Change subject: Refactor ShortUrl to allow it to be used in printed version
..

Refactor ShortUrl to allow it to be used in printed version

I9232084e049a08ab4221633a446e7c78b2f50bdc will allow us to
render short urls inside the printed versions.

Change-Id: I07f90c9e98c324c1773c233cb2bca9085dec70b5
---
M ShortUrl.hooks.php
1 file changed, 32 insertions(+), 18 deletions(-)


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

diff --git a/ShortUrl.hooks.php b/ShortUrl.hooks.php
index 44db8fe..64a68c8 100644
--- a/ShortUrl.hooks.php
+++ b/ShortUrl.hooks.php
@@ -27,14 +27,12 @@
}
 
/**
-* @param $tpl SkinTemplate
-* @return bool
+* Return the URL to show in the printed version of the page
+*
+* @return string url for printed version
 */
-   public static function addToolboxLink( &$tpl ) {
-   global $wgShortUrlTemplate, $wgServer, $wgShortUrlReadOnly;
-   if ( $wgShortUrlReadOnly ) {
-   return true;
-   }
+   public static function getShortURL( $title, $oldid ) {
+   global $wgShortUrlTemplate, $wgServer;
 
if ( !is_string( $wgShortUrlTemplate ) ) {
$urlTemplate = SpecialPage::getTitleFor( 'ShortUrl', 
'$1' )->getFullUrl();
@@ -42,7 +40,6 @@
$urlTemplate = $wgServer . $wgShortUrlTemplate;
}
 
-   $title = $tpl->getSkin()->getTitle();
if ( ShortUrlUtils::needsShortUrl( $title ) ) {
try {
$shortId = ShortUrlUtils::encodeTitle( $title );
@@ -50,18 +47,35 @@
$shortId = false;
}
if ( $shortId !== false ) {
-   $shortURL = str_replace( '$1', $shortId, 
$urlTemplate );
-   $html = Html::rawElement( 'li', [ 'id' => 
't-shorturl' ],
-   Html::Element( 'a', [
-   'href' => $shortURL,
-   'title' => wfMessage( 
'shorturl-toolbox-title' )->text()
-   ],
-   wfMessage( 
'shorturl-toolbox-text' )->text() )
-   );
-
-   echo $html;
+   return str_replace( '$1', $shortId, 
$urlTemplate );
}
}
+   return false;
+   }
+
+   /**
+* @param $tpl SkinTemplate
+* @return bool
+*/
+   public static function addToolboxLink( &$tpl ) {
+   global $wgShortUrlReadOnly;
+   if ( $wgShortUrlReadOnly ) {
+   return true;
+   }
+
+   $shortURL = self::getShortURL( $tpl->getSkin()->getTitle() );
+   if ( $shortURL ) {
+   $html = Html::rawElement( 'li', [ 'id' => 't-shorturl' 
],
+   Html::Element( 'a', [
+   'href' => $shortURL,
+   'title' => wfMessage( 
'shorturl-toolbox-title' )->text()
+   ],
+   wfMessage( 'shorturl-toolbox-text' 
)->text() )
+   );
+
+   echo $html;
+   }
+
return true;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07f90c9e98c324c1773c233cb2bca9085dec70b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ShortUrl
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: mwext-testextension-php55-composer to jessie

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: mwext-testextension-php55-composer to jessie
..


mwext-testextension-php55-composer to jessie

Affects:

ArticlePlaceholder
BlueSpiceEditNotifyConnector
BlueSpiceFoundation
BlueSpiceInsertTemplate
BlueSpicePageVersion
BlueSpiceSignHere
Bootstrap
BSSMWConnector
GitHub
GoogleLogin
LifeWeb
NSFileRepo
OAuthAuthentication
PhpTagsSMW
PropertySuggester
reCaptcha
SemanticACL
SemanticGenealogy
SemanticHighcharts
SemanticSifter
SemanticTitle
SideBarMenu
TemplateStyles
ThrottleOverride
VIKI
VikiSemanticTitle
VikiTitleIcon
WebPlatformAuth
Wikibase
WikibaseJavaScriptApi
WikibaseLexeme
WikibaseMediaInfo
WikibaseQuality
WikibaseQualityConstraints
WikibaseQualityExternalValidation
Wikidata.org
WikimediaBadges
XenForoAuth

Bug: T161882
Change-Id: I34cb6ae2848bb10402c5033823451f87598b6c95
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 89977b6..263eabb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -953,14 +953,13 @@
  - mwgate-php55lint
  - mwext-testextension-hhvm-composer-jessie
 php5:
- - mwext-testextension-php55-composer-trusty
+ - mwext-testextension-php55-composer-jessie
 gate-and-submit: 
  - mwgate-php55lint
- - mwext-testextension-php55-composer-trusty
+ - mwext-testextension-php55-composer-jessie
  - mwext-testextension-hhvm-composer-jessie
 gate-and-submit-swat: *extension-unittests-composer-gate-and-submit
 experimental:
- - mwext-testextension-php55-composer-jessie
  - mwext-qunit-composer-jessie
  - mwgate-npm-node-6-jessie
  - mwgate-composer-php70-jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34cb6ae2848bb10402c5033823451f87598b6c95
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: mwext-testextension-php55-composer to jessie

2017-09-07 Thread Hashar (Code Review)

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

Change subject: mwext-testextension-php55-composer to jessie
..

mwext-testextension-php55-composer to jessie

Affects:

ArticlePlaceholder
BlueSpiceEditNotifyConnector
BlueSpiceFoundation
BlueSpiceInsertTemplate
BlueSpicePageVersion
BlueSpiceSignHere
Bootstrap
BSSMWConnector
GitHub
GoogleLogin
LifeWeb
NSFileRepo
OAuthAuthentication
PhpTagsSMW
PropertySuggester
reCaptcha
SemanticACL
SemanticGenealogy
SemanticHighcharts
SemanticSifter
SemanticTitle
SideBarMenu
TemplateStyles
ThrottleOverride
VIKI
VikiSemanticTitle
VikiTitleIcon
WebPlatformAuth
Wikibase
WikibaseJavaScriptApi
WikibaseLexeme
WikibaseMediaInfo
WikibaseQuality
WikibaseQualityConstraints
WikibaseQualityExternalValidation
Wikidata.org
WikimediaBadges
XenForoAuth

Bug: T161882
Change-Id: I34cb6ae2848bb10402c5033823451f87598b6c95
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/376579/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 89977b6..263eabb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -953,14 +953,13 @@
  - mwgate-php55lint
  - mwext-testextension-hhvm-composer-jessie
 php5:
- - mwext-testextension-php55-composer-trusty
+ - mwext-testextension-php55-composer-jessie
 gate-and-submit: 
  - mwgate-php55lint
- - mwext-testextension-php55-composer-trusty
+ - mwext-testextension-php55-composer-jessie
  - mwext-testextension-hhvm-composer-jessie
 gate-and-submit-swat: *extension-unittests-composer-gate-and-submit
 experimental:
- - mwext-testextension-php55-composer-jessie
  - mwext-qunit-composer-jessie
  - mwgate-npm-node-6-jessie
  - mwgate-composer-php70-jessie

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix "On this day" for "selected" for first days of months.

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix "On this day" for "selected" for first days of months.
..


Fix "On this day" for "selected" for first days of months.

Icremented version to 0.3.1

Bug: T174707
Change-Id: Ibdd0f98600188fcce68175212901a40126761ea9
---
M lib/feed/on-this-day.languages.js
M lib/mobile-util.js
2 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/lib/feed/on-this-day.languages.js 
b/lib/feed/on-this-day.languages.js
index 5fa67d9..e0279d2 100644
--- a/lib/feed/on-this-day.languages.js
+++ b/lib/feed/on-this-day.languages.js
@@ -85,8 +85,14 @@
 },
 selectedPage: {
 // 
https://fr.wikipedia.org/api/rest_v1/page/html/Wikipédia:Éphéméride%2F22_mai
-nameFormatter : (monthName, monthNumber, dayNumber) =>
-`Wikipédia:Éphéméride/${dayNumber}_${monthName}`,
+nameFormatter : (monthName, monthNumber, dayNumber) => {
+if (dayNumber === 1) {
+if (new Set([1, 2, 3, 5, 9, 10, 11, 12]).has(monthNumber)) 
{
+dayNumber = '1er';
+}
+}
+return `Wikipédia:Éphéméride/${dayNumber}_${monthName}`;
+},
 listElementSelector: 'body > ul li'
 },
 yearListElementRegEx :
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index f244c23..a44fc75 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -13,7 +13,7 @@
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
 compilations: { name: 'compilations', version: '0.1.0' },
-onthisday: { name: 'onthisday', version: '0.3.0' },
+onthisday: { name: 'onthisday', version: '0.3.1' },
 unpublished: { name: 'unpublished', version: '0.0.0' }
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdd0f98600188fcce68175212901a40126761ea9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mhurd 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Non voting php5.5 job to jessie

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Non voting php5.5 job to jessie
..


Non voting php5.5 job to jessie

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a79d1f3..89977b6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -974,7 +974,7 @@
  - mwext-testextension-hhvm-composer-jessie-non-voting
  - mwgate-composer-validate
 php5:
- - mwext-testextension-php55-composer-trusty-non-voting
+ - mwext-testextension-php55-composer-jessie-non-voting
 gate-and-submit:
  
  - mwgate-php55lint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4013170abeadcc2d7e82c223615b6d0a7a3d267e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
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]: Revert "icinga/base: screen monitoring by default. whitelist...

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: Revert "icinga/base: screen monitoring by default. whitelist 
copper, terbium"
..


Revert "icinga/base: screen monitoring by default. whitelist copper, terbium"

This reverts commit dce429bfe4b12ca22937449c3d851e381e315451.

Change-Id: I959702d4c12bc24d727922e33de6a330a4e28355
---
D hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
D hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
deleted file mode 100644
index 4bfa7b0..000
--- a/hieradata/hosts/copper.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index 370806d..f9409f6 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1 +1,2 @@
 do_acme: false
+monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
deleted file mode 100644
index 4bfa7b0..000
--- a/hieradata/hosts/terbium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 1aa33e9..a7bd6c5 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
 }
 }
 
-if hiera('monitor_screens', true) {
+if hiera('monitor_screens', false) {
 
 file { '/usr/local/lib/nagios/plugins/check_long_procs':
 ensure => present,

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Non voting php5.5 job to jessie

2017-09-07 Thread Hashar (Code Review)

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

Change subject: Non voting php5.5 job to jessie
..

Non voting php5.5 job to jessie

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/376578/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a79d1f3..89977b6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -974,7 +974,7 @@
  - mwext-testextension-hhvm-composer-jessie-non-voting
  - mwgate-composer-validate
 php5:
- - mwext-testextension-php55-composer-trusty-non-voting
+ - mwext-testextension-php55-composer-jessie-non-voting
 gate-and-submit:
  
  - mwgate-php55lint

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "icinga/base: screen monitoring by default. whitelist...

2017-09-07 Thread Dzahn (Code Review)

Hello Giuseppe Lavagetto, Muehlenhoff, Alexandros Kosiaris, jenkins-bot, Gehel,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "icinga/base: screen monitoring by default. whitelist 
copper, terbium"
..

Revert "icinga/base: screen monitoring by default. whitelist copper, terbium"

This reverts commit dce429bfe4b12ca22937449c3d851e381e315451.

Change-Id: I959702d4c12bc24d727922e33de6a330a4e28355
---
D hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
D hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/376577/1

diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
deleted file mode 100644
index 4bfa7b0..000
--- a/hieradata/hosts/copper.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index 370806d..f9409f6 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1 +1,2 @@
 do_acme: false
+monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
deleted file mode 100644
index 4bfa7b0..000
--- a/hieradata/hosts/terbium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 1aa33e9..a7bd6c5 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
 }
 }
 
-if hiera('monitor_screens', true) {
+if hiera('monitor_screens', false) {
 
 file { '/usr/local/lib/nagios/plugins/check_long_procs':
 ensure => present,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I959702d4c12bc24d727922e33de6a330a4e28355
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
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/event-schemas[master]: Set a different pattern for the request_id of the job event

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Set a different pattern for the request_id of the job event
..


Set a different pattern for the request_id of the job event

Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5
---
M jsonschema/mediawiki/job/1.yaml
M test/jsonschema/meta_common_schema.yaml
2 files changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index 237e42c..1325223 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -25,9 +25,7 @@
   request_id:
 description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
 type: string
-# TODO: Temporary disable this validation requirement while working on 
a proper fix
-# because it's causing an alert.
-#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+pattern: '^[a-zA-Z0-9\-]+$'
   id:
 description: The unique ID of this event; should match the dt field.
 type: string
diff --git a/test/jsonschema/meta_common_schema.yaml 
b/test/jsonschema/meta_common_schema.yaml
index 40fcdac..6651b0e 100644
--- a/test/jsonschema/meta_common_schema.yaml
+++ b/test/jsonschema/meta_common_schema.yaml
@@ -22,9 +22,7 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-# TODO: Temporary disable this validation requirement while working on 
a proper fix
-# because it's causing an alert.
-#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+# We don't test for the pattern, because the job events have different 
request-id pattern
 description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
   id:
 type: string

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Reuse the request_id that the job sets, not the x-request-id.

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Reuse the request_id that the job sets, not the x-request-id.
..


Reuse the request_id that the job sets, not the x-request-id.

Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
---
M JobQueueEventBus.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 18259ad..73fb6d2 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -32,11 +32,16 @@
 
$attrs['params'] = $params;
 
-   return EventBus::createEvent(
+   $event = EventBus::createEvent(
EventBus::getArticleURL( $job->getTitle() ),
'mediawiki.job.' . $job->getType(),
$attrs
);
+
+   // The jobs set a request ID unconditionally, so we should 
reuse that one
+   $event['meta']['request_id'] = $event['params']['requestId'];
+
+   return $event;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix possible startup issue with VirtualBox 5.1

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix possible startup issue with VirtualBox 5.1
..


Fix possible startup issue with VirtualBox 5.1

Change-Id: Ie9f01fe6d3d0e30d3e16097ffda564210d3db9da
---
M Vagrantfile
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 4398c72..6506712 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -170,6 +170,11 @@
 vb.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
 vb.customize ['modifyvm', :id, '--ioapic', 'on']  # Bug 51473
 
+# The most recent versions of VirtualBox (5.1.x) seem to start the NAT
+# interface as disconnected (preventing startup), so we need to turn it
+# on explicitly. https://github.com/mitchellh/vagrant/issues/7648
+vb.customize ['modifyvm', :id, '--cableconnected1', 'on']
+
 # Speed up dns resolution in some cases
 vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
 vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9f01fe6d3d0e30d3e16097ffda564210d3db9da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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]: set deploy1001 isntall params

2017-09-07 Thread RobH (Code Review)

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

Change subject: set deploy1001 isntall params
..


set deploy1001 isntall params

deploy1001 install info, setting to spare until pressed into service

Bug: T175288
Change-Id: I157ba11946749f8d7260c1ca2e7bbf59c965966d
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 14 insertions(+), 5 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 0466759..4e61632 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -801,6 +801,11 @@
 role(tendril)
 }
 
+# will become a deployment server and fold into deployment stanza with 
tin/naos T175288
+node 'deploy1001.eqiad.wmnet' {
+role(spare::system)
+interface::add_ip6_mapped { 'main': }
+}
 
 # Analytics Druid servers.
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 80339d6..b3a5cb8 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,6 +67,7 @@
 db109[6-9]|db110[0-6]|db1069) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]|dbstore2001) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
+deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \
 druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \
 dumpsdata100[12]|labstore100[67]) echo partman/dumpsdata100X.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 91dd991..4c673bd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -517,6 +517,11 @@
 fixed-address cp1074.eqiad.wmnet;
 }
 
+host cp1099 {
+hardware ethernet 90:B1:1C:3B:C7:2C;
+fixed-address cp1099.eqiad.wmnet;
+}
+
 host cp2001 {
 hardware ethernet 44:A8:42:2D:20:1D;
 fixed-address cp2001.codfw.wmnet;
@@ -646,8 +651,6 @@
 hardware ethernet 44:A8:42:2D:1C:87;
 fixed-address cp2026.codfw.wmnet;
 }
-
-
 
 host cp3003 {
 hardware ethernet D4:AE:52:8C:8B:7E;
@@ -1797,9 +1800,9 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host cp1099 {
-hardware ethernet 90:B1:1C:3B:C7:2C;
-fixed-address cp1099.eqiad.wmnet;
+host deploy1001 {
+hardware ethernet 14:18:77:5B:2B:1D;
+fixed-address deploy1001.eqiad.wmnet;
 }
 
 host druid1001 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I157ba11946749f8d7260c1ca2e7bbf59c965966d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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]: set deploy1001 isntall params

2017-09-07 Thread RobH (Code Review)

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

Change subject: set deploy1001 isntall params
..

set deploy1001 isntall params

deploy1001 install info, setting to spare until pressed into service

Bug: T175288
Change-Id: I157ba11946749f8d7260c1ca2e7bbf59c965966d
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 14 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/376576/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0466759..4e61632 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -801,6 +801,11 @@
 role(tendril)
 }
 
+# will become a deployment server and fold into deployment stanza with 
tin/naos T175288
+node 'deploy1001.eqiad.wmnet' {
+role(spare::system)
+interface::add_ip6_mapped { 'main': }
+}
 
 # Analytics Druid servers.
 # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 80339d6..b3a5cb8 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,6 +67,7 @@
 db109[6-9]|db110[0-6]|db1069) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]|dbstore2001) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
+deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \
 druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \
 dumpsdata100[12]|labstore100[67]) echo partman/dumpsdata100X.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 91dd991..4c673bd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -517,6 +517,11 @@
 fixed-address cp1074.eqiad.wmnet;
 }
 
+host cp1099 {
+hardware ethernet 90:B1:1C:3B:C7:2C;
+fixed-address cp1099.eqiad.wmnet;
+}
+
 host cp2001 {
 hardware ethernet 44:A8:42:2D:20:1D;
 fixed-address cp2001.codfw.wmnet;
@@ -646,8 +651,6 @@
 hardware ethernet 44:A8:42:2D:1C:87;
 fixed-address cp2026.codfw.wmnet;
 }
-
-
 
 host cp3003 {
 hardware ethernet D4:AE:52:8C:8B:7E;
@@ -1797,9 +1800,9 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host cp1099 {
-hardware ethernet 90:B1:1C:3B:C7:2C;
-fixed-address cp1099.eqiad.wmnet;
+host deploy1001 {
+hardware ethernet 14:18:77:5B:2B:1D;
+fixed-address deploy1001.eqiad.wmnet;
 }
 
 host druid1001 {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Set a different pattern for the request_id of the job event

2017-09-07 Thread Ppchelko (Code Review)

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

Change subject: Set a different pattern for the request_id of the job event
..

Set a different pattern for the request_id of the job event

Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5
---
M jsonschema/mediawiki/job/1.yaml
M test/jsonschema/meta_common_schema.yaml
2 files changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/75/376575/1

diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index 237e42c..1325223 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -25,9 +25,7 @@
   request_id:
 description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
 type: string
-# TODO: Temporary disable this validation requirement while working on 
a proper fix
-# because it's causing an alert.
-#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+pattern: '^[a-zA-Z0-9\-]+$'
   id:
 description: The unique ID of this event; should match the dt field.
 type: string
diff --git a/test/jsonschema/meta_common_schema.yaml 
b/test/jsonschema/meta_common_schema.yaml
index 40fcdac..6651b0e 100644
--- a/test/jsonschema/meta_common_schema.yaml
+++ b/test/jsonschema/meta_common_schema.yaml
@@ -22,9 +22,7 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-# TODO: Temporary disable this validation requirement while working on 
a proper fix
-# because it's causing an alert.
-#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+# We don't test for the pattern, because the job events have different 
request-id pattern
 description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
   id:
 type: string

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c5dafd35d5f7f9ef3329a4deb3d69ab8cdd6bf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/base: screen monitoring by default. whitelist copper, ...

2017-09-07 Thread Dzahn (Code Review)

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

Change subject: icinga/base: screen monitoring by default. whitelist copper, 
terbium
..


icinga/base: screen monitoring by default. whitelist copper, terbium

Enable screen/tmux monitoring for all hosts by default, except whitelist
copper and terbium per the original ticket.

Any others to remove?

Bug: T165348
Change-Id: Ib34a53205235eb9310a32731f1383e6a77985ee7
---
A hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
A hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
new file mode 100644
index 000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/copper.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index f9409f6..370806d 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1,2 +1 @@
 do_acme: false
-monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
new file mode 100644
index 000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/terbium.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index a7bd6c5..1aa33e9 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
 }
 }
 
-if hiera('monitor_screens', false) {
+if hiera('monitor_screens', true) {
 
 file { '/usr/local/lib/nagios/plugins/check_long_procs':
 ensure => present,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34a53205235eb9310a32731f1383e6a77985ee7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
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...EventBus[master]: Reuse the request_id that the job sets, not the x-request-id.

2017-09-07 Thread Ppchelko (Code Review)

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

Change subject: Reuse the request_id that the job sets, not the x-request-id.
..

Reuse the request_id that the job sets, not the x-request-id.

Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
---
M JobQueueEventBus.php
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 18259ad..73fb6d2 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -32,11 +32,16 @@
 
$attrs['params'] = $params;
 
-   return EventBus::createEvent(
+   $event = EventBus::createEvent(
EventBus::getArticleURL( $job->getTitle() ),
'mediawiki.job.' . $job->getType(),
$attrs
);
+
+   // The jobs set a request ID unconditionally, so we should 
reuse that one
+   $event['meta']['request_id'] = $event['params']['requestId'];
+
+   return $event;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable responsive reference columns on Wikitionaries and Wik...

2017-09-07 Thread Jforrester (Code Review)

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

Change subject: Enable responsive reference columns on Wikitionaries and 
Wikivoyages
..

Enable responsive reference columns on Wikitionaries and Wikivoyages

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1a55d2e..264fb5c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14963,9 +14963,10 @@
'mswiki' => true, // T165247
'nowiki' => true, // T160362
 
-   'enwiktionary' => true, // T160933
-
-   'wikiquote' => true, // T159895
+   // Wiki families
+   'wiktionary' => true, // T159895 overall, T160933 for enwikt
+   'wikiquote' => true, // T159895 overall
+   'wikivoyage' => true, // T159895 overall
 ],
 
 'wmgUseRSSExtension' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...minus-x[master]: Initial commit of tool to identify files that shouldn't be e...

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Initial commit of tool to identify files that shouldn't be 
executable
..

Initial commit of tool to identify files that shouldn't be executable

Basic usage:

$ ./bin/minus-x.php check .

Auto-fixing:

$ ./bin/minus-x.php fix .

It will automatically ignore anything with "node_modules", "vendor", or
".git" in the path.

Change-Id: Iac6de598bd47e9b12c028d31ee546c61399ba24c
---
A .gitignore
A COPYING
A bin/minus-x.php
A composer.json
A phpcs.xml
A src/CheckCommand.php
A src/FixCommand.php
7 files changed, 1,063 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/minus-x 
refs/changes/72/376572/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..de4a392
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/vendor
+/composer.lock
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ 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.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  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
+them 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.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: Allow phabricator as a source

2017-09-07 Thread Thcipriani (Code Review)

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

Change subject: Scap: Allow phabricator as a source
..

Scap: Allow phabricator as a source

Setting the origin is already set up in the scap_source puppet type, but
not in the scap::source puppet resource. This adds 'origin' as a
configurable parameter of the scap::source puppet resource. This also
updates the git url for phabricator.

Change-Id: I1bbe9b6af0e76e606375619812eebd71ff7eb123
---
M modules/scap/lib/puppet/provider/scap_source/default.rb
M modules/scap/manifests/source.pp
2 files changed, 8 insertions(+), 2 deletions(-)


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

diff --git a/modules/scap/lib/puppet/provider/scap_source/default.rb 
b/modules/scap/lib/puppet/provider/scap_source/default.rb
index f901355..f401ed4 100644
--- a/modules/scap/lib/puppet/provider/scap_source/default.rb
+++ b/modules/scap/lib/puppet/provider/scap_source/default.rb
@@ -41,7 +41,7 @@
 when :gerrit
   "https://gerrit.wikimedia.org/r/p/#{repo_name}.git;
 when :phabricator
-  "https://phabricator.wikimedia.org/diffusion/#{repo_name}.git;
+  "https://phabricator.wikimedia.org/source/#{repo_name}.git;
 end
   end
 
@@ -50,7 +50,7 @@
 when :gerrit
   origin.slice! "https://gerrit.wikimedia.org/r/p/;
 when :phabricator
-  origin.slice! "https://phabricator.wikimedia.org/diffusion/;
+  origin.slice! "https://phabricator.wikimedia.org/source/;
 end
 origin.gsub(/\.git$/, '')
   end
diff --git a/modules/scap/manifests/source.pp b/modules/scap/manifests/source.pp
index 39c0244..8c51986 100644
--- a/modules/scap/manifests/source.pp
+++ b/modules/scap/manifests/source.pp
@@ -45,6 +45,10 @@
 #   Base path for deployments.
 #   Default: /srv/deployment
 #
+# [*origin*]
+#   Origin of cloned repository, either gerrit or phabricator
+#   Default: phabricator
+#
 # [*lvs_service*]
 #   Name of the lvs service associated with this deployment, if any
 #
@@ -91,6 +95,7 @@
 $owner= 'trebuchet',
 $group= 'wikidev',
 $base_path= '/srv/deployment',
+$origin   = 'gerrit',
 $canaries = undef,
 $lvs_service  = undef,
 $hosts= undef,
@@ -103,6 +108,7 @@
 owner   => $owner,
 group   => $group,
 base_path   => $base_path,
+origin  => $origin,
 }
 
 # Scap dsh lists.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...minus-x[master]: Add .gitreview

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: Iae706996e08d56883f1ac13ae1dc9f2aa106294a
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..64081dd
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/tools/minus-x.git
+track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae706996e08d56883f1ac13ae1dc9f2aa106294a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/minus-x
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...minus-x[master]: Add .gitreview

2017-09-07 Thread Legoktm (Code Review)

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

Change subject: Add .gitreview
..

Add .gitreview

Change-Id: Iae706996e08d56883f1ac13ae1dc9f2aa106294a
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/minus-x 
refs/changes/70/376570/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..64081dd
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/tools/minus-x.git
+track=1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae706996e08d56883f1ac13ae1dc9f2aa106294a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/minus-x
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.30.0-wmf.17]: Do not use deprecated fallback handling for History/Contribu...

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Do not use deprecated fallback handling for 
History/Contributions
..


Do not use deprecated fallback handling for History/Contributions

The Contributions page extends the History page so this change
also fixes the warnings there.

Bug: T175161
Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
---
M includes/specials/SpecialMobileHistory.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index 08193ca..3a1dc5d 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -157,7 +157,7 @@
$options['LIMIT'] = self::LIMIT + 1;
 
$tables = [ self::DB_REVISIONS_TABLE ];
-   $fields = [ '*' ];
+   $fields = Revision::selectFields();
 
$res = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
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...MobileFrontend[master]: Do not use deprecated fallback handling for History/Contribu...

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Do not use deprecated fallback handling for 
History/Contributions
..


Do not use deprecated fallback handling for History/Contributions

The Contributions page extends the History page so this change
also fixes the warnings there.

Bug: T175161
Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
---
M includes/specials/SpecialMobileHistory.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index 08193ca..3a1dc5d 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -157,7 +157,7 @@
$options['LIMIT'] = self::LIMIT + 1;
 
$tables = [ self::DB_REVISIONS_TABLE ];
-   $fields = [ '*' ];
+   $fields = Revision::selectFields();
 
$res = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
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[master]: Retry deadlock / lock wait failures

2017-09-07 Thread Ejegg (Code Review)

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

Change subject: Retry deadlock / lock wait failures
..

Retry deadlock / lock wait failures

Just using preg_match on the 'sql' extra parameter to find the
nativecode. The alternative involves upstreaming code not just
to CiviCRM but also to PEAR.

Bug: T118487
Change-Id: I1bd04821e778a0bee02a92fcbd408f62c19ffcc1
---
M sites/all/modules/wmf_common/WmfException.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/sites/all/modules/wmf_common/WmfException.php 
b/sites/all/modules/wmf_common/WmfException.php
index 22d9e66..4617391 100644
--- a/sites/all/modules/wmf_common/WmfException.php
+++ b/sites/all/modules/wmf_common/WmfException.php
@@ -180,6 +180,14 @@
 
 function isRequeue()
 {
+   if ( $this->extra && !empty( $this->extra['sql'] ) ) {
+   // We want to retry later if the problem was a lock wait timeout
+   // or a deadlock. Unfortunately we have to do string 
parsing to
+   // figure that out.
+   if ( preg_match( '/\bnativecode=12(05|13)\b/', 
$this->extra['sql'] ) ) {
+   return TRUE;
+   }
+   }
 return $this->getErrorCharacteristic('requeue', FALSE);
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations...plugins[master]: adding Priority: optional to metadata

2017-09-07 Thread Gehel (Code Review)

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

Change subject: adding Priority: optional to metadata
..

adding Priority: optional to metadata

Change-Id: I200600e2dfd7b37293a5b3c7f55b6461ae5cb634
---
M debian/control
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/elasticsearch/plugins 
refs/changes/68/376568/1

diff --git a/debian/control b/debian/control
index 657ad8a..01326fd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@
 Package: wmf-elasticsearch-search-plugins
 Architecture: all
 Section: database
+Priority: optional
 Description: Elasticsearch plugins for search
  List of plugins needed by the elasticsearch cluster that powers search on
  wmf sites.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I200600e2dfd7b37293a5b3c7f55b6461ae5cb634
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/elasticsearch/plugins
Gerrit-Branch: master
Gerrit-Owner: Gehel 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Doc] Clean up uses of ' ' placeholder

2017-09-07 Thread Code Review

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

Change subject: [Doc] Clean up uses of '' placeholder
..

[Doc] Clean up uses of '' placeholder

Change-Id: I1fa0410e67c52c22d2391b97155730f45ec64498
---
M scripts/claimit.py
M scripts/coordinate_import.py
M scripts/match_images.py
M scripts/patrol.py
M scripts/revertbot.py
M scripts/script_wui.py
M scripts/surnames_redirects.py
7 files changed, 12 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/67/376567/1

diff --git a/scripts/claimit.py b/scripts/claimit.py
index 845ad49..5741732 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -3,6 +3,10 @@
 """
 A script that adds claims to Wikidata items based on a list of pages.
 
+These command line parameters can be used to specify which pages to work on:
+
+
+
 --
 
 Usage:
diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py
index 41f6b47..1a1f3e0 100755
--- a/scripts/coordinate_import.py
+++ b/scripts/coordinate_import.py
@@ -21,6 +21,8 @@
 python pwb.py coordinate_import -lang:it -family:wikipedia \
 -namespace:0 -transcludes:Infobox_stazione_ferroviaria
 
+These command line parameters can be used to specify which pages to work on:
+
 
 """
 #
@@ -35,6 +37,8 @@
 from pywikibot import pagegenerators, WikidataBot
 from pywikibot.exceptions import CoordinateGlobeUnknownException
 
+docuReplacements = {'': pagegenerators.parameterHelp}
+
 
 class CoordImportRobot(WikidataBot):
 
diff --git a/scripts/match_images.py b/scripts/match_images.py
index d618bca..b5c8923 100755
--- a/scripts/match_images.py
+++ b/scripts/match_images.py
@@ -9,8 +9,6 @@
 
 It is essential to provide two images to work on.
 
-
-
 Furthermore, the following command line parameters are supported:
 
 -otherfamilyMentioned family with this parameter will be preferred for
diff --git a/scripts/patrol.py b/scripts/patrol.py
index bc3bdc9..98de168 100755
--- a/scripts/patrol.py
+++ b/scripts/patrol.py
@@ -27,6 +27,8 @@
 
 https://en.wikisource.org/wiki/User:Wikisource-bot/patrol_whitelist
 
+
+
 Commandline parameters
 ==
 
diff --git a/scripts/revertbot.py b/scripts/revertbot.py
index d417347..89d8d4b 100755
--- a/scripts/revertbot.py
+++ b/scripts/revertbot.py
@@ -5,8 +5,6 @@
 
 The following command line parameters are supported:
 
-
-
 -username Edits of which user need to be reverted.
 
 -rollback Rollback edits instead of reverting them.
diff --git a/scripts/script_wui.py b/scripts/script_wui.py
index e552a4e..839bf24 100755
--- a/scripts/script_wui.py
+++ b/scripts/script_wui.py
@@ -11,12 +11,6 @@
 (some code might get compiled on-the-fly, so a GNU compiler along
 with library header files is needed too)
 
-The following parameters are supported:
-
-
-
-All other parameters will be ignored.
-
 Syntax example:
 
 python pwb.py script_wui -dir:.
diff --git a/scripts/surnames_redirects.py b/scripts/surnames_redirects.py
index d817fda..ab19916 100755
--- a/scripts/surnames_redirects.py
+++ b/scripts/surnames_redirects.py
@@ -28,6 +28,8 @@
 from pywikibot import i18n, pagegenerators
 from pywikibot.bot import FollowRedirectPageBot, ExistingPageBot
 
+docuReplacements = {'': pagegenerators.parameterHelp}
+
 
 class SurnamesBot(ExistingPageBot, FollowRedirectPageBot):
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fa0410e67c52c22d2391b97155730f45ec64498
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
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] operations/puppet[production]: WIP: icinga: add check_sysctl.sh script

2017-09-07 Thread Herron (Code Review)

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

Change subject: WIP: icinga: add check_sysctl.sh script
..

WIP: icinga: add check_sysctl.sh script

Add check_sysctl.sh script to compare configured sysctl values
to running values.

Bug: T160060
Change-Id: I5c6aaa746e81d1733074a102e78372ac55a09901
---
A modules/icinga/files/check_sysctl.sh
1 file changed, 85 insertions(+), 0 deletions(-)


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

diff --git a/modules/icinga/files/check_sysctl.sh 
b/modules/icinga/files/check_sysctl.sh
new file mode 100644
index 000..0618ea6
--- /dev/null
+++ b/modules/icinga/files/check_sysctl.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+#
+# check_sysctl.sh - check running sysctl values against configuration files
+# note: this will print only one mismatch to keep alert text concise
+# 2017 Keith Herron 
+
+# Command locations
+sysctl_cmd="/sbin/sysctl"
+
+function print_help() {
+  echo "
+$0 - check sysctl config file(s) against running values
+
+usage: $0 -f 
+
+options:
+  -f  Required - Sysctl configuration file location(s).  To supply 
multiple
+  files use a space delimited list.
+  -h  Print this help text
+"
+
+  exit 3
+}
+
+# Check that options were provided
+if [ $# -lt 1 ]; then
+  print_help
+fi
+
+# Gather options.  -f requres an argument -h does not.
+while getopts 'f:h' OPT; do
+  case $OPT in
+f)  files=$OPTARG;;
+h)  print_help;;
+*)  print_help;;
+  esac
+done
+
+# Check if provided file(s) exist.
+for file in ${files}; do
+  if [ ! -r $file ]; then
+echo "error: config file $file does not exist"
+print_help
+exit 1
+  fi
+done
+
+for file in ${files}; do
+
+  while read -r line; do
+
+# Skip lines that do not begin with an alphanumeric
+[[ "$line" =~ ^[:alnum:] ]] || continue
+
+# Remove whitespace from line
+line=${line//[[:space:]]/}
+
+# Split line into key/val variables using = delimiter
+configured_key=${line%=*};
+configured_val=${line#*=};
+
+running_val=`$sysctl_cmd -b "${configured_key}" 2>/dev/null`
+
+if [ $running_val ]; then
+  if [ ${running_val} != ${configured_val} ]; then
+echo -n "WARNING: "
+echo "${configured_key}" running value ${running_val} does not match 
value of "${configured_val} configured in ${file}"
+exit 1
+  else
+matched=yes
+  fi
+fi
+
+  done < "$file"
+
+done
+
+if [ $matched ]; then
+echo -n "OK: "
+echo "Running sysctl values match config file(s) $files"
+exit 0
+else
+echo "UNKNOWN: No entries in this file match matched running values.  Are 
you sure this is a sysctl config file?"
+exit 3
+fi

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Disable validating request-id while working on a fix

2017-09-07 Thread Ottomata (Code Review)

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

Change subject: Disable validating request-id while working on a fix
..


Disable validating request-id while working on a fix

Change-Id: Ic488fea9c754a950c57d74a7ded605795942bf2c
---
M jsonschema/mediawiki/job/1.yaml
M test/jsonschema/meta_common_schema.yaml
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index 630df4a..237e42c 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -25,7 +25,9 @@
   request_id:
 description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
 type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+# TODO: Temporary disable this validation requirement while working on 
a proper fix
+# because it's causing an alert.
+#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
   id:
 description: The unique ID of this event; should match the dt field.
 type: string
diff --git a/test/jsonschema/meta_common_schema.yaml 
b/test/jsonschema/meta_common_schema.yaml
index c304170..40fcdac 100644
--- a/test/jsonschema/meta_common_schema.yaml
+++ b/test/jsonschema/meta_common_schema.yaml
@@ -22,7 +22,9 @@
 description: the unique URI identifying the event / resource
   request_id:
 type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+# TODO: Temporary disable this validation requirement while working on 
a proper fix
+# because it's causing an alert.
+#pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
 description: the unique UUID v1 ID of the event derived from the 
X-Request-Id header
   id:
 type: string

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic488fea9c754a950c57d74a7ded605795942bf2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.30.0-wmf.17]: Do not use deprecated fallback handling for History/Contribu...

2017-09-07 Thread Chad (Code Review)

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

Change subject: Do not use deprecated fallback handling for 
History/Contributions
..

Do not use deprecated fallback handling for History/Contributions

The Contributions page extends the History page so this change
also fixes the warnings there.

Bug: T175161
Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
---
M includes/specials/SpecialMobileHistory.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index 08193ca..d2dd152 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -2,6 +2,7 @@
 /**
  * SpecialMobileHistory.php
  */
+use \Revision;
 
 /**
  * Mobile formatted history of of a page
@@ -157,7 +158,7 @@
$options['LIMIT'] = self::LIMIT + 1;
 
$tables = [ self::DB_REVISIONS_TABLE ];
-   $fields = [ '*' ];
+   $fields = Revision::selectFields();
 
$res = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia79d6e72c185fb3ffd47d62a0dc5342b31382294
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Chad 
Gerrit-Reviewer: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.30.0-wmf.17]: Move handling for missing post content to lower level

2017-09-07 Thread Chad (Code Review)

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

Change subject: Move handling for missing post content to lower level
..

Move handling for missing post content to lower level

* Don't throw for this case (even though we caught it internally).
  Instead, just log the issue and return the stub.
  If the caller wants to know, they can call isContentCurrentlyRetrievable.

  (It is important that there's a way to distinguish, since users could
  put this content manually).

* Add or tweak more debugging statements for other cases (not content,
  but other places using this i18n message).

* Add public isContentCurrentlyRetrievable to check for this case

* Tweak message to 'content' instead of 'post'.

Bug: T139791
Change-Id: I2e00d13e9de347ac49843097ab1ea855773fba1d
---
M i18n/en.json
M includes/Formatter/TopicListQuery.php
M includes/Model/AbstractRevision.php
M includes/Repository/RootPostLoader.php
M includes/Templating.php
5 files changed, 34 insertions(+), 20 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 7f7c562..88a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -86,7 +86,7 @@
"flow-show-change": "Show changes",
"flow-last-modified-by": "Last {{GENDER:$1|modified}} by $1",
"flow-system-usertext": "{{SITENAME}}",
-   "flow-stub-post-content": "Due to a technical error, this post 
could not be retrieved.",
+   "flow-stub-post-content": "Due to a technical error, this content 
could not be retrieved.",
"flow-newtopic-title-placeholder": "New topic",
"flow-newtopic-content-placeholder": "Post a new message to \"$1\"",
"flow-newtopic-header": "Add a new topic",
diff --git a/includes/Formatter/TopicListQuery.php 
b/includes/Formatter/TopicListQuery.php
index efd8c92..216ad59 100644
--- a/includes/Formatter/TopicListQuery.php
+++ b/includes/Formatter/TopicListQuery.php
@@ -49,6 +49,8 @@
if ( $missing ) {
$needed = [];
foreach ( $missing as $alpha ) {
+   wfDebugLog( 'Flow', __METHOD__ . ': Failed to 
load latest revision for post ID ' . $alpha );
+
// convert alpha back into UUID object
$needed[] = $allPostIds[$alpha];
}
diff --git a/includes/Model/AbstractRevision.php 
b/includes/Model/AbstractRevision.php
index 051fe90..082fe2b 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -9,6 +9,7 @@
 use Flow\Conversion\Utils;
 use ContentHandler;
 use Hooks;
+use Sanitizer;
 use Title;
 use User;
 use RecentChange;
@@ -353,6 +354,20 @@
}
 
/**
+* Checks whether the content is retrievable.
+*
+* False is an error state, used when the content is unretrievable, 
e.g. due to data loss (T95580)
+* or a temporary database error.
+*
+* This is unrelated to whether the content is loaded on-demand.
+*
+* @return bool
+*/
+   public function isContentCurrentlyRetrievable() {
+   return $this->content !== false;
+   }
+
+   /**
 * DO NOT USE THIS METHOD to output the content; use
 * Templating::getContent, which will do additional (permissions-based)
 * checks to make sure it outputs something the user can see.
@@ -362,9 +377,17 @@
 * @throws InvalidDataException
 */
public function getContent( $format = 'html' ) {
-   if ( $this->content === false ) {
-   throw new InvalidDataException( 'Failed to load the 
content' );
+   if ( !$this->isContentCurrentlyRetrievable() ) {
+   wfDebugLog( 'Flow', __METHOD__ . ': Failed to load the 
content of revision with rev_id ' . $this->revId->getAlphadecimal() );
+
+   $stubContent = wfMessage( 'flow-stub-post-content' 
)->parse();
+   if ( !in_array( $format, [ 'html', 'fixed-html' ] ) ) {
+   $stubContent = Sanitizer::stripAllTags( 
$stubContent );
+   }
+
+   return $stubContent;
}
+
if ( $this->xssCheck === false ) {
return '';
}
diff --git a/includes/Repository/RootPostLoader.php 
b/includes/Repository/RootPostLoader.php
index cfaf111..8564b30 100644
--- a/includes/Repository/RootPostLoader.php
+++ b/includes/Repository/RootPostLoader.php
@@ -146,7 +146,7 @@
$post->setReplyToId( 
$parents[$postId->getAlphadecimal()] );
$posts[$postId->getAlphadecimal()] = $post;
 
-   wfWarn( 'Missing Posts: ' .

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove MainMenu usage inside Skin

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Remove MainMenu usage inside Skin
..


Hygiene: Remove MainMenu usage inside Skin

Change-Id: I29540f2e175ca0eb5ff97e6dd86982f82dc4c3ea
Depends-On: I4fac234cb9ead7e99dc52f72819cd4a3c715de1c
---
M resources/mobile.startup/Skin.js
1 file changed, 6 insertions(+), 33 deletions(-)

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



diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 2c24cf8..0569614 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -109,33 +109,13 @@
 */
defaults: {
page: undefined,
-   tabletModules: [],
-   mainMenu: undefined
+   tabletModules: []
},
 
/**
 * @inheritdoc
 */
events: {},
-
-   /**
-* Close navigation if content tapped
-* @param {jQuery.Event} ev
-* @private
-*/
-   _onPageCenterClick: function ( ev ) {
-   var $target = this.$( ev.target );
-
-   // Make sure the menu is open and we are not clicking 
on the menu button
-   if (
-   this.mainMenu &&
-   this.mainMenu.isOpen() &&
-   !$target.hasClass( 'main-menu-button' )
-   ) {
-   this.mainMenu.closeNavigationDrawers();
-   ev.preventDefault();
-   }
-   },
 
/**
 * @inheritdoc
@@ -155,18 +135,11 @@
 */
this.emit( 'changed' );
 
-   // FIXME: This can be removed soon and is only here
-   // for backwards compatibility. Use `emit` from now on.
-   if ( this.mainMenu ) {
-   this.$( '#mw-mf-page-center' ).on( 'click',
-   $.proxy( this, '_onPageCenterClick' ) );
-   } else {
-   /**
-* @event click
-* Fired when the skin is clicked.
-*/
-   this.$( '#mw-mf-page-center' ).on( 'click', 
this.emit.bind( this, 'click' ) );
-   }
+   /**
+* @event click
+* Fired when the skin is clicked.
+*/
+   this.$( '#mw-mf-page-center' ).on( 'click', 
this.emit.bind( this, 'click' ) );
},
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29540f2e175ca0eb5ff97e6dd86982f82dc4c3ea
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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/mediawiki-config[master]: group1 to wmf.17

2017-09-07 Thread jenkins-bot (Code Review)

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

Change subject: group1 to wmf.17
..


group1 to wmf.17

Change-Id: I0e15fe3c7fb28cf1279d5a23ebd2d8671e70f66b
---
M php
M wikiversions.json
2 files changed, 603 insertions(+), 603 deletions(-)

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



diff --git a/php b/php
index 633715f..7de0bf8 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.16
\ No newline at end of file
+php-1.30.0-wmf.17
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 8695b24..9969715 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.16",
-"aawikibooks": "php-1.30.0-wmf.16",
-"aawiktionary": "php-1.30.0-wmf.16",
+"aawikibooks": "php-1.30.0-wmf.17",
+"aawiktionary": "php-1.30.0-wmf.17",
 "abwiki": "php-1.30.0-wmf.16",
-"abwiktionary": "php-1.30.0-wmf.16",
+"abwiktionary": "php-1.30.0-wmf.17",
 "acewiki": "php-1.30.0-wmf.16",
-"advisorywiki": "php-1.30.0-wmf.16",
+"advisorywiki": "php-1.30.0-wmf.17",
 "adywiki": "php-1.30.0-wmf.16",
 "afwiki": "php-1.30.0-wmf.16",
-"afwikibooks": "php-1.30.0-wmf.16",
-"afwikiquote": "php-1.30.0-wmf.16",
-"afwiktionary": "php-1.30.0-wmf.16",
+"afwikibooks": "php-1.30.0-wmf.17",
+"afwikiquote": "php-1.30.0-wmf.17",
+"afwiktionary": "php-1.30.0-wmf.17",
 "akwiki": "php-1.30.0-wmf.16",
-"akwikibooks": "php-1.30.0-wmf.16",
-"akwiktionary": "php-1.30.0-wmf.16",
+"akwikibooks": "php-1.30.0-wmf.17",
+"akwiktionary": "php-1.30.0-wmf.17",
 "alswiki": "php-1.30.0-wmf.16",
-"alswikibooks": "php-1.30.0-wmf.16",
-"alswikiquote": "php-1.30.0-wmf.16",
-"alswiktionary": "php-1.30.0-wmf.16",
+"alswikibooks": "php-1.30.0-wmf.17",
+"alswikiquote": "php-1.30.0-wmf.17",
+"alswiktionary": "php-1.30.0-wmf.17",
 "amwiki": "php-1.30.0-wmf.16",
-"amwikiquote": "php-1.30.0-wmf.16",
-"amwiktionary": "php-1.30.0-wmf.16",
+"amwikiquote": "php-1.30.0-wmf.17",
+"amwiktionary": "php-1.30.0-wmf.17",
 "angwiki": "php-1.30.0-wmf.16",
-"angwikibooks": "php-1.30.0-wmf.16",
-"angwikiquote": "php-1.30.0-wmf.16",
-"angwikisource": "php-1.30.0-wmf.16",
-"angwiktionary": "php-1.30.0-wmf.16",
+"angwikibooks": "php-1.30.0-wmf.17",
+"angwikiquote": "php-1.30.0-wmf.17",
+"angwikisource": "php-1.30.0-wmf.17",
+"angwiktionary": "php-1.30.0-wmf.17",
 "anwiki": "php-1.30.0-wmf.16",
-"anwiktionary": "php-1.30.0-wmf.16",
+"anwiktionary": "php-1.30.0-wmf.17",
 "arbcom_cswiki": "php-1.30.0-wmf.16",
 "arbcom_dewiki": "php-1.30.0-wmf.16",
 "arbcom_enwiki": "php-1.30.0-wmf.16",
@@ -35,880 +35,880 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.16",
 "arcwiki": "php-1.30.0-wmf.16",
 "arwiki": "php-1.30.0-wmf.16",
-"arwikibooks": "php-1.30.0-wmf.16",
-"arwikimedia": "php-1.30.0-wmf.16",
-"arwikinews": "php-1.30.0-wmf.16",
-"arwikiquote": "php-1.30.0-wmf.16",
-"arwikisource": "php-1.30.0-wmf.16",
-"arwikiversity": "php-1.30.0-wmf.16",
-"arwiktionary": "php-1.30.0-wmf.16",
+"arwikibooks": "php-1.30.0-wmf.17",
+"arwikimedia": "php-1.30.0-wmf.17",
+"arwikinews": "php-1.30.0-wmf.17",
+"arwikiquote": "php-1.30.0-wmf.17",
+"arwikisource": "php-1.30.0-wmf.17",
+"arwikiversity": "php-1.30.0-wmf.17",
+"arwiktionary": "php-1.30.0-wmf.17",
 "arzwiki": "php-1.30.0-wmf.16",
 "astwiki": "php-1.30.0-wmf.16",
-"astwikibooks": "php-1.30.0-wmf.16",
-"astwikiquote": "php-1.30.0-wmf.16",
-"astwiktionary": "php-1.30.0-wmf.16",
+"astwikibooks": "php-1.30.0-wmf.17",
+"astwikiquote": "php-1.30.0-wmf.17",
+"astwiktionary": "php-1.30.0-wmf.17",
 "aswiki": "php-1.30.0-wmf.16",
-"aswikibooks": "php-1.30.0-wmf.16",
-"aswikisource": "php-1.30.0-wmf.16",
-"aswiktionary": "php-1.30.0-wmf.16",
+"aswikibooks": "php-1.30.0-wmf.17",
+"aswikisource": "php-1.30.0-wmf.17",
+"aswiktionary": "php-1.30.0-wmf.17",
 "atjwiki": "php-1.30.0-wmf.16",
-"auditcomwiki": "php-1.30.0-wmf.16",
+"auditcomwiki": "php-1.30.0-wmf.17",
 "avwiki": "php-1.30.0-wmf.16",
-"avwiktionary": "php-1.30.0-wmf.16",
+"avwiktionary": "php-1.30.0-wmf.17",
 "aywiki": "php-1.30.0-wmf.16",
-"aywikibooks": "php-1.30.0-wmf.16",
-"aywiktionary": "php-1.30.0-wmf.16",
+"aywikibooks": "php-1.30.0-wmf.17",
+"aywiktionary": "php-1.30.0-wmf.17",
 "azbwiki": "php-1.30.0-wmf.16",
 "azwiki": "php-1.30.0-wmf.16",
-"azwikibooks": "php-1.30.0-wmf.16",
-"azwikiquote": "php-1.30.0-wmf.16",
-"azwikisource": "php-1.30.0-wmf.16",
-"azwiktionary": "php-1.30.0-wmf.16",
+"azwikibooks": "php-1.30.0-wmf.17",
+"azwikiquote": "php-1.30.0-wmf.17",
+"azwikisource": "php-1.30.0-wmf.17",
+

1 2 3 >

1 - 100 of 268 matches

Mail list logo