[MediaWiki-commits] [Gerrit] Added Debian package for apertium-eo-es - change (operations...apertium-eo-es)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Added Debian package for apertium-eo-es
..


Added Debian package for apertium-eo-es

Bug: T102101
Change-Id: Ife4e47451f22b32ab351d817adead1c7edfc48b9
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 136 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..c0c5eac
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,26 @@
+apertium-eo-es (0.9.1~r60655-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * New upstream release.
+  * Significant changes in svn since tarball, so mixing new build scripts with
+old data files.
+  * Re-done packaging to take advantage of debhelper 9.
+
+  [ Kartik Mistry ]
+  * Fixed debian/copyright.
+
+ -- Kartik Mistry   Wed, 02 Sep 2015 11:46:13 +0530
+
+apertium-eo-es (0.9.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild against apertium 3.1: fix build dependency and configure.ac
+accordingly; re-run autoconf. (Closes: #527788)
+
+ -- Stefano Zacchiroli   Thu, 10 Sep 2009 13:23:35 +0200
+
+apertium-eo-es (0.9.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #466678)
+
+ -- Francis Tyers   Wed, 20 Feb 2008 11:34:15 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..74ebd6c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: apertium-eo-es
+Section: science
+Priority: optional
+Maintainer: Kartik Mistry 
+Build-Depends: apertium,
+   autotools-dev,
+   cg3,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (>= 3.3),
+   locales,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-eo-es.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-eo-es.git
+
+Package: apertium-eo-es
+Architecture: all
+Depends: apertium (>= 3.3), cg3, ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-es-eo
+Conflicts: apertium-es-eo
+Description: Apertium translation data for the Esperanto-Spanish pair
+ Data package providing Apertium language resources for translating
+ between the Esperanto and Spanish languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..d42425f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,47 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2005-2007, Universitat d'Alacant (Transducens group)
+2007, Universitat Pompeu Fabra
+2009, Hèctor Alòs i Font 
+License: GPL-2
+
+Files: autogen.sh
+Copyright: 2002, Daniel Elstner  
+License: GPL-2
+
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found 

[MediaWiki-commits] [Gerrit] Add Josa to Extensions Used by Wikimedia - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Add Josa to Extensions Used by Wikimedia
..


Add Josa to Extensions Used by Wikimedia

Probably useful only for Korean, but it's just one message.

Change-Id: Ifaa9d974e73706442a570861ef693b481a889f66
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index 8c002db..a152191 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -57,6 +57,7 @@
   - ext-gwtoolset # 2013-12-17 for Wikimedia Commons
   - ext-imagemetrics # 2014-09-23 I92887158fbfb161299a2f45b6b66bc8c35c246b5
   - ext-insider # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
+  - ext-josa
   - ext-jsonconfig
   - ext-labeledsectiontransclusion
   - ext-landingcheck

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaa9d974e73706442a570861ef693b481a889f66
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use the VirtualRESTService to configure CX - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Use the VirtualRESTService to configure CX
..


Use the VirtualRESTService to configure CX

This allows CX to use either Parsoid or RESTBase via the VRS, and
to share its configuration with Visual Editor.

Bug: T111490
Change-Id: I33bc150fa302d9523df92e9e8a258a19b63847f5
---
M api/ApiContentTranslationPublish.php
M extension.json
2 files changed, 53 insertions(+), 8 deletions(-)

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



diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index 7728ebb..bf2fe20 100755
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -24,15 +24,59 @@
protected $serviceClient;
 
public function __construct( ApiMain $main, $name ) {
-   global $wgContentTranslationParsoid;
parent::__construct( $main, $name );
$this->serviceClient = new VirtualRESTServiceClient( new 
MultiHttpClient( array() ) );
-   $parsoidConfig = $wgContentTranslationParsoid;
-   $this->serviceClient->mount( '/parsoid/', new 
ParsoidVirtualRESTService( array(
-   'URL' => $parsoidConfig['url'],
-   'prefix' => $parsoidConfig['prefix'],
-   'timeout' => $parsoidConfig['timeout'],
-   ) ) );
+   $this->serviceClient->mount( '/parsoid/', $this->getVRSObject() 
);
+   }
+
+   /**
+* Creates the virtual REST service object to be used in CX's API 
calls. The
+* method determines whether to instantiate a ParsoidVirtualRESTService 
or a
+* RestbaseVirtualRESTService object based on configuration directives: 
if
+* $wgVirtualRestConfig['modules']['restbase'] is defined, RESTBase is 
chosen,
+* otherwise Parsoid is used (either by using the MW Core config, or the
+* CX-local one).
+*
+* @return VirtualRESTService the VirtualRESTService object to use
+*/
+   private function getVRSObject() {
+   // the params array to create the service object with
+   $params = array();
+   // the VRS class to use, defaults to Parsoid
+   $class = 'ParsoidVirtualRESTService';
+   // the global virtual rest service config object, if any
+   $vrs = $this->getConfig()->get( 'VirtualRestConfig' );
+   if ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['restbase'] ) ) {
+   // if restbase is available, use it
+   $params = $vrs['modules']['restbase'];
+   $class = 'RestbaseVirtualRESTService';
+   // remove once VE generates restbase paths
+   $params['parsoidCompat'] = true;
+   } elseif ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['parsoid'] ) ) {
+   // there's a global parsoid config, use it next
+   $params = $vrs['modules']['parsoid'];
+   } else {
+   // no global modules defined, fall back to old defaults
+   $config = $this->getConfig()->get( 
'ContentTranslationParsoid' );
+   $params = array(
+   'URL' => $config['url'],
+   'prefix' => $config['prefix'],
+   'domain' => $config['domain'],
+   'timeout' => $config['timeout'],
+   );
+   }
+   // merge the global and service-specific params
+   if ( isset( $vrs['global'] ) ) {
+   $params = array_merge( $vrs['global'], $params );
+   }
+   // set up cookie forwarding
+   if ( $params['forwardCookies'] && !User::isEveryoneAllowed( 
'read' ) ) {
+   $params['forwardCookies'] = 
RequestContext::getMain()->getRequest()->getHeader( 'Cookie' );
+   } else {
+   $params['forwardCookies'] = false;
+   }
+   // create the VRS object and return it
+   return new $class( $params );
}
 
private function requestParsoid( $method, $path, $params ) {
diff --git a/extension.json b/extension.json
index b8910ae..a8e1a8e 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,8 @@
"ContentTranslationParsoid": {
"url": "http://parsoid-lb.eqiad.wikimedia.org/;,
"timeout": 10,
-   "prefix": "enwiki"
+   "prefix": "enwiki",
+   "domain": "en.wikipedia.org"
},
"ContentTranslationDatabase": null,

[MediaWiki-commits] [Gerrit] Use the VirtualRESTService to configure CX - change (mediawiki...ContentTranslation)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Use the VirtualRESTService to configure CX
..

Use the VirtualRESTService to configure CX

This allows CX to use either Parsoid or RESTBase via the VRS, and
to share its configuration with Visual Editor.

Bug: T111490
Change-Id: I33bc150fa302d9523df92e9e8a258a19b63847f5
---
M api/ApiContentTranslationPublish.php
M extension.json
2 files changed, 53 insertions(+), 8 deletions(-)


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

diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index 7728ebb..bf2fe20 100755
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -24,15 +24,59 @@
protected $serviceClient;
 
public function __construct( ApiMain $main, $name ) {
-   global $wgContentTranslationParsoid;
parent::__construct( $main, $name );
$this->serviceClient = new VirtualRESTServiceClient( new 
MultiHttpClient( array() ) );
-   $parsoidConfig = $wgContentTranslationParsoid;
-   $this->serviceClient->mount( '/parsoid/', new 
ParsoidVirtualRESTService( array(
-   'URL' => $parsoidConfig['url'],
-   'prefix' => $parsoidConfig['prefix'],
-   'timeout' => $parsoidConfig['timeout'],
-   ) ) );
+   $this->serviceClient->mount( '/parsoid/', $this->getVRSObject() 
);
+   }
+
+   /**
+* Creates the virtual REST service object to be used in CX's API 
calls. The
+* method determines whether to instantiate a ParsoidVirtualRESTService 
or a
+* RestbaseVirtualRESTService object based on configuration directives: 
if
+* $wgVirtualRestConfig['modules']['restbase'] is defined, RESTBase is 
chosen,
+* otherwise Parsoid is used (either by using the MW Core config, or the
+* CX-local one).
+*
+* @return VirtualRESTService the VirtualRESTService object to use
+*/
+   private function getVRSObject() {
+   // the params array to create the service object with
+   $params = array();
+   // the VRS class to use, defaults to Parsoid
+   $class = 'ParsoidVirtualRESTService';
+   // the global virtual rest service config object, if any
+   $vrs = $this->getConfig()->get( 'VirtualRestConfig' );
+   if ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['restbase'] ) ) {
+   // if restbase is available, use it
+   $params = $vrs['modules']['restbase'];
+   $class = 'RestbaseVirtualRESTService';
+   // remove once VE generates restbase paths
+   $params['parsoidCompat'] = true;
+   } elseif ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['parsoid'] ) ) {
+   // there's a global parsoid config, use it next
+   $params = $vrs['modules']['parsoid'];
+   } else {
+   // no global modules defined, fall back to old defaults
+   $config = $this->getConfig()->get( 
'ContentTranslationParsoid' );
+   $params = array(
+   'URL' => $config['url'],
+   'prefix' => $config['prefix'],
+   'domain' => $config['domain'],
+   'timeout' => $config['timeout'],
+   );
+   }
+   // merge the global and service-specific params
+   if ( isset( $vrs['global'] ) ) {
+   $params = array_merge( $vrs['global'], $params );
+   }
+   // set up cookie forwarding
+   if ( $params['forwardCookies'] && !User::isEveryoneAllowed( 
'read' ) ) {
+   $params['forwardCookies'] = 
RequestContext::getMain()->getRequest()->getHeader( 'Cookie' );
+   } else {
+   $params['forwardCookies'] = false;
+   }
+   // create the VRS object and return it
+   return new $class( $params );
}
 
private function requestParsoid( $method, $path, $params ) {
diff --git a/extension.json b/extension.json
index b8910ae..a8e1a8e 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,8 @@
"ContentTranslationParsoid": {
"url": "http://parsoid-lb.eqiad.wikimedia.org/;,
"timeout": 10,
-   "prefix": "enwiki"
+   "prefix": "enwiki",
+   "domain": "en.wikipedia.org"
},
 

[MediaWiki-commits] [Gerrit] Test: DO NOT MERGE - change (mediawiki...TimedMediaHandler)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Test: DO NOT MERGE
..

Test: DO NOT MERGE

Change-Id: I0f2253100cb9fb1aa39973412422e8d55ed54d36
---
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
M TimedMediaHandler.hooks.php
M TimedMediaHandler_body.php
M TimedMediaTransformOutput.php
M resources/PopUpThumbVideo.css
A resources/ext.tmh.thumbnail
A resources/ext.tmh.thumbnail.css
7 files changed, 25 insertions(+), 10 deletions(-)


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

diff --git 
a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js 
b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
index 5ef54d4..60a82c6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
+++ b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -370,7 +370,6 @@
getPlayButtonPosition: function() {
var _this = this;
return {
-   'position' : 'absolute',
'left' : '50%',
'top' : '50%',
'margin-left' : - .5 * this.getComponentWidth( 
'playButtonLarge' ),
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 83432a3..54b7304 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -59,6 +59,9 @@
 
// Add the PopUpMediaTransform module ( specific to timedMedia 
handler ( no support in mwEmbed modules )
$wgResourceModules+= array(
+   'ext.tmh.thumbnail.styles' => $baseExtensionResource + 
array(
+   'styles' => 'resources/ext.tmh.thumbnail.css',
+   ),
'mw.PopUpMediaTransform' => $baseExtensionResource + 
array(
'scripts' => 'resources/mw.PopUpThumbVideo.js',
'dependencies' => array( 'mw.MwEmbedSupport', 
'mediawiki.Title', 'mw.PopUpMediaTransform.styles' ),
@@ -201,6 +204,7 @@
public static function onImageOpenShowImageInlineBefore( $imagePage, 
$out ) {
$handler = $imagePage->getDisplayedFile()->getHandler();
if ( $handler !== false && $handler instanceof 
TimedMediaHandler ) {
+   $out->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$out->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
@@ -456,6 +460,7 @@
}
 
if ( $addModules ) {
+   $out->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$out->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index c49cef1..20809d6 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -201,6 +201,7 @@
return ;
}
$parserOutput->hasTimedMediaTransform = true;
+   $parserOutput->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$parserOutput->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index 3653209..e743aa1 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -321,7 +321,7 @@
// Build the video tag output:
$s = Xml::tags( 'div' , array(
'class' => 'mediaContainer',
-   'style' => 
'position:relative;display:block;width:'. $width
+   'style' => 'width:'. $width
),
Html::rawElement( $this->getTagName(), 
$this->getMediaAttr( $sizeOverride, $autoPlay ),
// The set of media sources:
diff --git a/resources/PopUpThumbVideo.css b/resources/PopUpThumbVideo.css
index c55bb06..7e2722e 100644
--- a/resources/PopUpThumbVideo.css
+++ b/resources/PopUpThumbVideo.css
@@ -13,17 +13,9 @@
/* @embed */
background-image:url('player_big_play_button_hover.png');
 }
-.PopUpMediaTransform {
-   position : relative;
-   display: inline-block;
-}
 /* Should hopefully be only visible to screen readers */
 .mw-tmh-playtext {
display: block;
height: 0;
overflow: hidden;
-}
-
-li.gallerybox div.thumb div.PopUpMediaTransform {
-margin: 0 auto;
 }
diff --git a/resources/ext.tmh.thumbnail b/resources/ext.tmh.thumbnail
new file mode 100644
index 

[MediaWiki-commits] [Gerrit] Convert SpecialMergeItems to HTMLForm in 'ooui' mode - change (mediawiki...Wikibase)

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review.

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

Change subject: Convert SpecialMergeItems to HTMLForm in 'ooui' mode
..

Convert SpecialMergeItems to HTMLForm in 'ooui' mode

Bug: T48248
Change-Id: I2b666e550122f4d5f3e3464a7df614654ddcc57e
---
M repo/includes/specials/SpecialMergeItems.php
1 file changed, 36 insertions(+), 95 deletions(-)


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

diff --git a/repo/includes/specials/SpecialMergeItems.php 
b/repo/includes/specials/SpecialMergeItems.php
index 5007f93..e1b699c 100644
--- a/repo/includes/specials/SpecialMergeItems.php
+++ b/repo/includes/specials/SpecialMergeItems.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Repo\Specials;
 
 use Exception;
+use HTMLForm;
 use Html;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -177,7 +178,7 @@
 * @param string $summary
 */
private function mergeItems( ItemId $fromId, ItemId $toId, array 
$ignoreConflicts, $summary ) {
-   $this->tokenCheck->checkRequestToken( $this->getRequest(), 
'token' );
+   $this->tokenCheck->checkRequestToken( $this->getRequest(), 
'wpEditToken' );
 
/** @var EntityRevision $newRevisionFrom  */
/** @var EntityRevision $newRevisionTo */
@@ -199,112 +200,52 @@
protected function createForm() {
$this->getOutput()->addModuleStyles( array( 'wikibase.special' 
) );
 
+   $pre = '';
if ( $this->getUser()->isAnon() ) {
-   $this->getOutput()->addHTML(
-   Html::rawElement(
-   'p',
-   array( 'class' => 'warning' ),
-   $this->msg(
-   'wikibase-anonymouseditwarning',
-   $this->msg( 
'wikibase-entity-item' )->text()
-   )->parse()
-   )
+   $pre = Html::rawElement(
+   'p',
+   array( 'class' => 'warning' ),
+   $this->msg(
+   'wikibase-anonymouseditwarning',
+   $this->msg( 'wikibase-entity-item' 
)->text()
+   )->parse()
);
}
 
-   // Form header
-   $this->getOutput()->addHTML(
-   Html::openElement(
-   'form',
-   array(
-   'method' => 'post',
-   'action' => 
$this->getPageTitle()->getFullUrl(),
-   'name' => 'mergeitems',
-   'id' => 'wb-mergeitems-form1',
-   'class' => 'wb-form'
-   )
-   )
-   . Html::openElement(
-   'fieldset',
-   array( 'class' => 'wb-fieldset' )
-   )
-   . Html::element(
-   'legend',
-   array( 'class' => 'wb-legend' ),
-   $this->msg( 'special-mergeitems' )->text()
-   )
-   );
-
-   // Form elements
-   $this->getOutput()->addHTML( $this->getFormElements() );
-
-   // Form body
-   $this->getOutput()->addHTML(
-   Html::element( 'br' )
-   . Html::input(
-   'wikibase-mergeitems-submit',
-   $this->msg( 'wikibase-mergeitems-submit' 
)->text(),
-   'submit',
-   array(
-   'id' => 'wb-mergeitems-submit',
-   'class' => 'wb-button'
-   )
-   )
-   . Html::input(
-   'token',
-   $this->getUser()->getEditToken(),
-   'hidden'
-   )
-   . Html::closeElement( 'fieldset' )
-   . Html::closeElement( 'form' )
-   );
+   HTMLForm::factory( 'ooui', $this->getFormElements(), 
$this->getContext() )
+   ->setId( 'wb-mergeitems-form1' )
+   ->setPreText( $pre )
+   ->setHeaderText( $this->msg( 

[MediaWiki-commits] [Gerrit] Add extension.json, remove php entry point - change (mediawiki...WikimediaIncubator)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add extension.json, remove php entry point
..

Add extension.json, remove php entry point

Change-Id: I1d29b0e38a258dc2c393c77aa72955aaab4e301d
---
M WikimediaIncubator.class.php
M WikimediaIncubator.php
A extension.json
3 files changed, 230 insertions(+), 174 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator 
refs/changes/08/236008/1

diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index c7290cb..38cac87 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -11,6 +11,22 @@
 
 class WikimediaIncubator {
 
+   public static function registerExtension() {
+   global $wgGroupPermissions;
+   /* Test wiki admin user group */
+   $wgGroupPermissions['test-sysop']['delete'] = true;
+   $wgGroupPermissions['test-sysop']['undelete'] = true;
+   $wgGroupPermissions['test-sysop']['deletedhistory'] = true;
+   $wgGroupPermissions['test-sysop']['block'] = true;
+   $wgGroupPermissions['test-sysop']['blockemail'] = true;
+   $wgGroupPermissions['test-sysop']['rollback'] = true;
+   $wgGroupPermissions['test-sysop']['suppressredirect'] = true;
+   $wgGroupPermissions['test-sysop']['autopatrol'] = true;
+
+   $wgGroupPermissions['*']['viewuserlang'] = false;
+   $wgGroupPermissions['sysop']['viewuserlang'] = true;
+   }
+
/**
 * Add default preference
 * @param $defOpt Array
diff --git a/WikimediaIncubator.php b/WikimediaIncubator.php
index df3a4d9..ee387d3 100644
--- a/WikimediaIncubator.php
+++ b/WikimediaIncubator.php
@@ -1,176 +1,16 @@
  __FILE__,
-   'name' => 'Wikimedia Incubator',
-   'author' => array( 'SPQRobin', 'Hydriz' ),
-   'version' => '5.3.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:WikimediaIncubator',
-   'descriptionmsg' => 'wminc-desc',
-);
-
-/* General (globals and/or configuration) */
-$wmincPref = 'incubatortestwiki'; // Name of the preference
-
-# only one-letter codes can be used for projects
-$wmincProjects = array(
-   'p' => 'Wikipedia',
-   'b' => 'Wikibooks',
-   't' => 'Wiktionary',
-   'q' => 'Wikiquote',
-   'n' => 'Wikinews',
-   'y' => 'Wikivoyage',
-);
-# Sister projects is here defined as projects that are not on Incubator
-$wmincSisterProjects = array(
-   's' => 'Wikisource',
-   'v' => 'Wikiversity',
-);
-$wmincMultilingualProjects = array(
-   'meta' => 'Meta-Wiki',
-   'commons' => 'Wikimedia Commons',
-   'species' => 'Wikispecies',
-   'mediawiki' => 'MediaWiki',
-   'wikidata' => 'Wikidata',
-);
-$wmincProjectSite = array(
-   'name' => 'Incubator',
-   'short' => 'inc',
-);
-$wmincTestWikiNamespaces = array(
-   NS_MAIN, NS_TALK,
-   NS_TEMPLATE, NS_TEMPLATE_TALK,
-   NS_CATEGORY, NS_CATEGORY_TALK,
-   828, 829, //NS_MODULE, NS_MODULE_TALK,
-);
-$wmincLangCodeLength = 12; // can be changed if needed (depends on policy)
-// Pseudo category namespaces like "Category:Maintenance:Delete", for easy 
whitelisting and structure
-$wmincPseudoCategoryNSes = array(
-   'Incubator', 'Help', 'Users', 'Maintenance', 'Files',
-);
-
-/* Test wiki admin user group */
-$wgGroupPermissions['test-sysop']['delete'] = true;
-$wgGroupPermissions['test-sysop']['undelete'] = true;
-$wgGroupPermissions['test-sysop']['deletedhistory'] = true;
-$wgGroupPermissions['test-sysop']['block'] = true;
-$wgGroupPermissions['test-sysop']['blockemail'] = true;
-$wgGroupPermissions['test-sysop']['rollback'] = true;
-$wgGroupPermissions['test-sysop']['suppressredirect'] = true;
-$wgGroupPermissions['test-sysop']['autopatrol'] = true;
-$wgAddGroups['bureaucrat'][] = 'test-sysop';
-$wgRemoveGroups['bureaucrat'][] = 'test-sysop';
-
-$wgMessagesDirs['WikimediaIncubator'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['WikimediaIncubatorAlias'] = __DIR__ . 
'/WikimediaIncubator.alias.php';
-$wgExtensionMessagesFiles['WikimediaIncubatorMagic'] = __DIR__ . 
'/WikimediaIncubator.i18n.magic.php';
-
-/* Special:ViewUserLang */
-$wgAutoloadClasses['SpecialViewUserLang'] = __DIR__ . 
'/SpecialViewUserLang.php';
-$wgSpecialPages['ViewUserLang'] = 'SpecialViewUserLang';
-$wgAvailableRights[] = 'viewuserlang';
-$wgHooks['ContributionsToolLinks'][] = 
'WikimediaIncubator::efLoadViewUserLangLink';
-$wgGroupPermissions['*']['viewuserlang'] = false;
-$wgGroupPermissions['sysop']['viewuserlang'] = true;
-
-/* TestWiki preference */
-$wgAutoloadClasses['WikimediaIncubator'] = __DIR__ . 
'/WikimediaIncubator.class.php';
-$wgHooks['GetPreferences'][] = 'WikimediaIncubator::onGetPreferences';
-$wgHooks['UserGetDefaultOptions'][] = 
'WikimediaIncubator::onUserGetDefaultOptions';

[MediaWiki-commits] [Gerrit] Implement list-server-groups command - change (operations...debdeploy)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Implement list-server-groups command
..


Implement list-server-groups command

Implement list-server-groups command to show which server groups still
need an update.

Also fixes restart of salt-master in postinst

Change-Id: Ie403603b551af9dbda392954723474927e629e36
---
M debian/changelog
M debian/debdeploy-master.postinst
M docs/readme.txt
M master/debdeploy
4 files changed, 59 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 7784bd1..0a9e091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debdeploy (0.0.4-1) jessie-wikimedia; urgency=medium
+
+  * Implement list-server-groups command
+  * Fix restart of salt-master
+
+ -- Moritz Muehlenhoff   Fri, 04 Sep 2015 13:37:23 
+0200
+
 debdeploy (0.0.3-1) jessie-wikimedia; urgency=medium
 
   * Remove some currently unused imports
diff --git a/debian/debdeploy-master.postinst b/debian/debdeploy-master.postinst
index fbebfc9..a8c6216 100644
--- a/debian/debdeploy-master.postinst
+++ b/debian/debdeploy-master.postinst
@@ -5,7 +5,7 @@
 then
 systemctl restart salt-master.service
 else
-service restart salt-master
+service salt-master restart
 fi
 
 #DEBHELPER#
diff --git a/docs/readme.txt b/docs/readme.txt
index eec1418..6add055 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -127,6 +127,15 @@
 
 debdeploy status-rollback -u elinks.yaml -s testsystem
 
+If you have an updatespec which applies to more than one group of
+servers (which will usually be the case for generic systems libs
+etc), you can check which server groups haven't had the update
+applied:
+
+debdeploy list-server-groups -u dpkg.yaml
+
+
+
 
 Restart detection / handling
 
diff --git a/master/debdeploy b/master/debdeploy
index 0cd8ee6..5912645 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -274,6 +274,40 @@
 print proc, "wasn't running on on", c_stopped[proc], "out of", c, 
"hosts."
 
 
+def list_server_groups(update=None):
+'''
+List all available server groups
+
+update  : If an update is specified, it is displayed whether an update
+  has already been deployed for that group.
+'''
+
+if not update:
+for servergroup in sorted(conf.server_groups):
+print servergroup
+else:
+done_list = []
+missing_list = []
+
+for servergroup in conf.server_groups:
+job_ran = False
+for grain in conf.server_groups[servergroup]:
+if joblogdb.does_job_exist(update, grain):
+job_ran = True
+if job_ran:
+done_list.append(servergroup)
+else:
+missing_list.append(servergroup)
+
+print update, "has been applied to these server groups:"
+for i in sorted(done_list):
+print i
+
+print
+print update, "hasn't been applied to these server groups:"
+for i in sorted(missing_list):
+print i
+
 def rollback(grains, update_file):
 '''
 Trigger process restarts for a set of servers
@@ -319,7 +353,8 @@
   status-deploy: Query the status of a software deployment, requires 
--update and --servers\n \
   rollback : Rollback a software deployment\n \
   status-rollback  : Query the status of a software deployment rollback\n \
-  list-server-groups   : Display a list of all defined server groups \n \
+  list-server-groups   : Display a list of all defined server groups. If an 
update file is listed \n \
+ in addition, it shows whether an update has been 
applied for that group. \n \
   check-missing: Display a list of all servers which don't have an 
update installed \n \
   pkgdb-source : Re-read the package status of a given host into the 
package database")
 
@@ -366,6 +401,12 @@
 elif command == "rollback":
 rollback(conf.server_groups[opt.serverlist], opt.updatefile)
 
+elif command == "list-server-groups":
+if opt.updatefile:
+list_server_groups(opt.updatefile)
+else:
+list_server_groups()
+
 sys.exit(0)
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie403603b551af9dbda392954723474927e629e36
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Avoid exponential years in MwTimeIsoFormatter - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Avoid exponential years in MwTimeIsoFormatter
..

Avoid exponential years in MwTimeIsoFormatter

It seems that some PHP versions magically format very large floating
point numbers as "1,0E+16". We do not want that for years.

This is already covered by a test.

Bug: T111343
Change-Id: Ie61114808e68c3032f1c21213f624ba6e9a79240
---
M lib/includes/formatters/MwTimeIsoFormatter.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php 
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 18eb622..3fb5a54 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -279,7 +279,7 @@
 
if ( empty( $msg ) ) {
// TODO: This needs a message.
-   return $number . ( $isBCE ? ' BCE' : '' );
+   return sprintf( '%.0f', $number ) . ( $isBCE ? ' BCE' : 
'' );
}
 
return $this->getMessage(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie61114808e68c3032f1c21213f624ba6e9a79240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Minor message text enhancements. - change (mediawiki...OAuthAuthentication)

[jenkins-bot (Code Review)]

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

Change subject: Minor message text enhancements.
..


Minor message text enhancements.

See also:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Oauthauth-localuser-not-allowed/en

Change-Id: I9923c8cb6696384ebabe106316d896a53178b82f
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c43d5f4..f48bd79 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,8 +14,8 @@
"oauthauth-create-userexists": "OAuth error logging you in. The 
username on the remote wiki already exists on this wiki. You must contact a 
bureaucrat to usurp the account.",
"oauthauth-login-noname": "The OAuth user is connected, but the name is 
not valid on this wiki.",
"oauthauth-login": "Log in on $1",
-   "oauthauth-login-usernotexists": "The OAuth user listed as connected, 
but the user does not exist on this wiki.",
+   "oauthauth-login-usernotexists": "The OAuth user is listed as 
connected, but the user does not exist on this wiki.",
"oauthauth-nologin-policy": "This wiki's policy will not let you 
login.",
-   "oauthauth-localuser-not-allowed": "Local account creation is disabled 
on this wiki. Click \"$1\" to create an account with OAuth.",
+   "oauthauth-localuser-not-allowed": "Local account creation is disabled 
on this wiki. \"$1\" creates an account with OAuth.",
"oauthauth-loggout-policy": "You have been logged out because the site 
policy no longer allows you to be logged in."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9923c8cb6696384ebabe106316d896a53178b82f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: Purodha 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added Debian package for apertium-eo-fr - change (operations...apertium-eo-fr)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Added Debian package for apertium-eo-fr
..


Added Debian package for apertium-eo-fr

Bug: T102101
Change-Id: Iddde6c5168f21d474187a2a8a3a050365cb4efaf
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 114 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..4743734
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,8 @@
+apertium-eo-fr (0.9.0~r28336-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release
+  * Significant changes in svn since tarball, so mixing new build scripts with
+old data files
+
+ -- Kartik Mistry   Wed, 02 Sep 2015 11:23:40 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..b2bff9b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: apertium-eo-fr
+Section: science
+Priority: optional
+Maintainer: Kartik Mistry 
+Build-Depends: apertium,
+   autotools-dev,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (>= 3.3),
+   locales,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-eo-fr.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-eo-fr.git
+
+Package: apertium-eo-fr
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-fr-eo
+Conflicts: apertium-fr-eo
+Description: Apertium translation data for the Esperanto-French pair
+ Data package providing Apertium language resources for translating
+ between the Esperanto and French languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..d588c7e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2005-2007, Universitat d'Alacant (Transducens group)
+2007, Universitat Pompeu Fabra
+2009, Hèctor Alòs i Font 
+2010, Corinne Daudier 
+2010, Jacob Nordfalk 
+2012, Bernard Chardonneau 
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..11004df
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when 

[MediaWiki-commits] [Gerrit] Add Debian package for apertium-fr-ca - change (operations...apertium-fr-ca)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Add Debian package for apertium-fr-ca
..


Add Debian package for apertium-fr-ca

Pairs: fr->ca, ca->fr

Bug: T99637
Change-Id: I43d979f05b12bdeb887905325c03b748b2d727c5
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 153 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..0d25272
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,39 @@
+apertium-fr-ca (1.0.3~r61329-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * New upstream release
+  * Significant changes in svn since tarball, so mixing new build scripts with
+old data files
+  * Re-done packaging to take advantage of debhelper 9
+
+  [ Kartik Mistry ]
+  * Set debian/compat to 9. Bumped dh dependency.
+  * Fixed debian/copyright.
+
+ -- Kartik Mistry   Wed, 02 Sep 2015 13:41:29 +0530
+
+apertium-fr-ca (1.0.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Added dependency on apertium-pcre2
+
+ -- Francis Tyers   Thu, 12 Mar 2009 20:31:32 +
+
+apertium-fr-ca (1.0.0-2) unstable; urgency=low
+
+  * Fixed Build-Depends (Closes: #446595)
+  * Upgrade to Apertium 3.0 (Closes: #445830)
+
+ -- Francis Tyers   Mon, 22 Oct 2007 16:30:23 +0100
+
+apertium-fr-ca (1.0.0-1) unstable; urgency=low
+
+  * Release requires Apertium 3
+
+ -- Francis Tyers   Fri,  5 Oct 2007 16:03:00 +0100
+
+apertium-fr-ca (0.7-1) unstable; urgency=low
+
+  * Initial release (Closes: #389229)
+
+ -- Francis Tyers   Sun, 24 Sep 2006 18:26:50 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..ad93525
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: apertium-fr-ca
+Section: science
+Priority: optional
+Maintainer: Kartik Mistry 
+Build-Depends: apertium,
+   autotools-dev,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (>= 3.3),
+   locales,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-fr-ca.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-fr-ca.git
+
+Package: apertium-fr-ca
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-ca-fr
+Conflicts: apertium-ca-fr
+Description: Apertium translation data for the French-Catalan pair
+ Data package providing Apertium language resources for translating
+ between the French and Catalan languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..2f0f155
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,52 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2005, Universitat d'Alacant, (Transducens group)
+   2007, Eleka Ingenieritza Linguistikoa S.L.
+ Prompsit Language Engineering S.L.
+   2009, Jimmy O'Regan
+License: GPL-2
+
+Files: filter.xsl
+Copyright: 2005, Universitat d'Alacant / Universidad de Alicante
+License: GPL-2
+
+Files: autogen.sh
+Copyright: 2002, Daniel Elstner  
+License: GPL-2
+
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope 

[MediaWiki-commits] [Gerrit] Add Debian package for apertium-ca-it - change (operations...apertium-ca-it)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Add Debian package for apertium-ca-it
..


Add Debian package for apertium-ca-it

Bug: T105582
Change-Id: Iadf7d2a51d65422b030a6a4f42cba81ce339fb20
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 122 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..48b768c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+apertium-ca-it (0.1.1~r57554-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release
+  * No significant changes in svn since tarball, so taking directly from svn
+
+ -- Kartik Mistry   Wed, 02 Sep 2015 12:14:23 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..93fa48e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: apertium-ca-it
+Section: science
+Priority: optional
+Maintainer: Kartik Mistry 
+Build-Depends: apertium,
+   autotools-dev,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (>= 3.3),
+   locales,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-ca-it.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-ca-it.git
+
+Package: apertium-ca-it
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-it-ca
+Conflicts: apertium-it-ca
+Description: Apertium translation data for the Catalan-Italian pair
+ Data package providing Apertium language resources for translating
+ between the Catalan and Italian languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..3434e8e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,53 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2009-2010, Antonio Toral 
+   2009-2012, Francis M. Tyers 
+   2009-2014, Jim O'Regan 
+   2010-2011, Carme Armentano 
+2010, Mireia Ginestí Rosell 
+2011, Hèctor Alòs i Font 
+   2012-2014, Kevin Brubeck Unhammer 
+2012, Anthony J. Bentley 

+2013, Trond Trosterud 
+License: GPL-2
+
+Files: alt.xsl
+ filter.xsl
+ translate-to-default-equivalent.xsl
+Copyright: 2005, Universitat d'Alacant / Universidad de Alicante
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ 

[MediaWiki-commits] [Gerrit] Add Debian package for apertium-eo-ca - change (operations...apertium-eo-ca)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Add Debian package for apertium-eo-ca
..


Add Debian package for apertium-eo-ca

Bug: T102101
Change-Id: I5246886b81a2da7391eae2b8de156c728330ad05
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 135 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..cb61e18
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,26 @@
+apertium-eo-ca (0.9.1~r60655-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * New upstream release.
+  * Significant changes in svn since tarball, so mixing new build scripts with
+old data files.
+  * Re-done packaging to take advantage of debhelper 9.
+
+  [ Kartik Mistry ]
+  * Fixed debian/copyright.
+
+ -- Kartik Mistry   Wed, 02 Sep 2015 12:53:00 +0530
+
+apertium-eo-ca (0.9.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild against apertium 3.1: fix build dependency and configure.ac
+accordingly; re-run autoconf. (Closes: #527799)
+
+ -- Stefano Zacchiroli   Wed, 09 Sep 2009 18:55:07 +0200
+
+apertium-eo-ca (0.9.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #466677)
+
+ -- Francis Tyers   Wed, 20 Feb 2008 11:34:15 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..c99d13e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: apertium-eo-ca
+Section: science
+Priority: optional
+Maintainer: Kartik Mistry 
+Build-Depends: apertium,
+   autotools-dev,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (>= 3.3),
+   locales,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-eo-ca.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-eo-ca.git
+
+Package: apertium-eo-ca
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-ca-eo
+Conflicts: apertium-ca-eo
+Description: Apertium translation data for the Esperanto-Catalan pair
+ Data package providing Apertium language resources for translating
+ between the Esperanto and Catalan languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..d42425f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,47 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2005-2007, Universitat d'Alacant (Transducens group)
+2007, Universitat Pompeu Fabra
+2009, Hèctor Alòs i Font 
+License: GPL-2
+
+Files: autogen.sh
+Copyright: 2002, Daniel Elstner  
+License: GPL-2
+
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in 

[MediaWiki-commits] [Gerrit] Convert SpecialItemByTitle to HTMLForm in 'ooui' mode - change (mediawiki...Wikibase)

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review.

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

Change subject: Convert SpecialItemByTitle to HTMLForm in 'ooui' mode
..

Convert SpecialItemByTitle to HTMLForm in 'ooui' mode

Bug: T48248
Change-Id: Ic6e10a007ffb68a8ba9dc150360293e426090a65
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 28 insertions(+), 61 deletions(-)


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

diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index 23289ea..0e77d71 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo\Specials;
 
+use HTMLForm;
 use Html;
 use Site;
 use SiteStore;
@@ -175,70 +176,36 @@
 
$this->getOutput()->addModules( 'wikibase.special.itemByTitle' 
);
 
-   $this->getOutput()->addHTML(
-   Html::openElement(
-   'form',
-   array(
-   'method' => 'get',
-   'action' => 
$this->getPageTitle()->getFullUrl(),
-   'name' => 'itembytitle',
-   'id' => 'wb-itembytitle-form1'
-   )
+   $formDescriptor = array(
+   'site' => array(
+   'name' => 'site',
+   'default' => htmlspecialchars( $siteId ),
+   'type' => 'text',
+   'cssclass' => 'wb-input',
+   'id' => 'wb-itembytitle-sitename',
+   'size' => 12,
+   'label-message' => 
'wikibase-itembytitle-lookup-site'
+   ),
+   'page' => array(
+   'name' => 'page',
+   'default' => $page ? htmlspecialchars( $page ) 
: '',
+   'type' => 'text',
+   'cssclass' => 'wb-input',
+   'id' => 'pagename',
+   'size' => 36,
+   'label-message' => 
'wikibase-itembytitle-lookup-page'
)
-   . Html::openElement( 'fieldset' )
-   . Html::element(
-   'legend',
-   array(),
-   $this->msg( 
'wikibase-itembytitle-lookup-fieldset' )->text()
-   )
-   . Html::label(
-   $this->msg( 'wikibase-itembytitle-lookup-site' 
)->text(),
-   'wb-itembytitle-sitename',
-   array(
-   'class' => 'wb-label'
-   )
-   )
-   . Html::input(
-   'site',
-   htmlspecialchars( $siteId ),
-   'text',
-   array(
-   'class' => 'wb-input',
-   'id' => 'wb-itembytitle-sitename',
-   'size' => 12
-   )
-   )
-   . ' '
-   . Html::label(
-   $this->msg( 'wikibase-itembytitle-lookup-page' 
)->text(),
-   'pagename',
-   array(
-   'class' => 'wb-label'
-   )
-   )
-   . Html::input(
-   'page',
-   $page ? htmlspecialchars( $page ) : '',
-   'text',
-   array(
-   'class' => 'wb-input',
-   'id' => 'pagename',
-   'size' => 36
-   )
-   )
-   . Html::input(
-   '',
-   $this->msg( 'wikibase-itembytitle-submit' 
)->text(),
-   'submit',
-   array(
-   'id' => 'wb-itembytitle-submit',
-   'class' => 'wb-button'
-   )
-   )
-   . Html::closeElement( 'fieldset' )
-  

[MediaWiki-commits] [Gerrit] Use the VirtualRESTService to configure CX - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Use the VirtualRESTService to configure CX
..


Use the VirtualRESTService to configure CX

This allows CX to use either Parsoid or RESTBase via the VRS, and
to share its configuration with Visual Editor.

Bug: T111490
Change-Id: I33bc150fa302d9523df92e9e8a258a19b63847f5
---
M api/ApiContentTranslationPublish.php
M extension.json
2 files changed, 53 insertions(+), 8 deletions(-)

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



diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index 7728ebb..bf2fe20 100755
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -24,15 +24,59 @@
protected $serviceClient;
 
public function __construct( ApiMain $main, $name ) {
-   global $wgContentTranslationParsoid;
parent::__construct( $main, $name );
$this->serviceClient = new VirtualRESTServiceClient( new 
MultiHttpClient( array() ) );
-   $parsoidConfig = $wgContentTranslationParsoid;
-   $this->serviceClient->mount( '/parsoid/', new 
ParsoidVirtualRESTService( array(
-   'URL' => $parsoidConfig['url'],
-   'prefix' => $parsoidConfig['prefix'],
-   'timeout' => $parsoidConfig['timeout'],
-   ) ) );
+   $this->serviceClient->mount( '/parsoid/', $this->getVRSObject() 
);
+   }
+
+   /**
+* Creates the virtual REST service object to be used in CX's API 
calls. The
+* method determines whether to instantiate a ParsoidVirtualRESTService 
or a
+* RestbaseVirtualRESTService object based on configuration directives: 
if
+* $wgVirtualRestConfig['modules']['restbase'] is defined, RESTBase is 
chosen,
+* otherwise Parsoid is used (either by using the MW Core config, or the
+* CX-local one).
+*
+* @return VirtualRESTService the VirtualRESTService object to use
+*/
+   private function getVRSObject() {
+   // the params array to create the service object with
+   $params = array();
+   // the VRS class to use, defaults to Parsoid
+   $class = 'ParsoidVirtualRESTService';
+   // the global virtual rest service config object, if any
+   $vrs = $this->getConfig()->get( 'VirtualRestConfig' );
+   if ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['restbase'] ) ) {
+   // if restbase is available, use it
+   $params = $vrs['modules']['restbase'];
+   $class = 'RestbaseVirtualRESTService';
+   // remove once VE generates restbase paths
+   $params['parsoidCompat'] = true;
+   } elseif ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['parsoid'] ) ) {
+   // there's a global parsoid config, use it next
+   $params = $vrs['modules']['parsoid'];
+   } else {
+   // no global modules defined, fall back to old defaults
+   $config = $this->getConfig()->get( 
'ContentTranslationParsoid' );
+   $params = array(
+   'URL' => $config['url'],
+   'prefix' => $config['prefix'],
+   'domain' => $config['domain'],
+   'timeout' => $config['timeout'],
+   );
+   }
+   // merge the global and service-specific params
+   if ( isset( $vrs['global'] ) ) {
+   $params = array_merge( $vrs['global'], $params );
+   }
+   // set up cookie forwarding
+   if ( $params['forwardCookies'] && !User::isEveryoneAllowed( 
'read' ) ) {
+   $params['forwardCookies'] = 
RequestContext::getMain()->getRequest()->getHeader( 'Cookie' );
+   } else {
+   $params['forwardCookies'] = false;
+   }
+   // create the VRS object and return it
+   return new $class( $params );
}
 
private function requestParsoid( $method, $path, $params ) {
diff --git a/extension.json b/extension.json
index b8910ae..a8e1a8e 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,8 @@
"ContentTranslationParsoid": {
"url": "http://parsoid-lb.eqiad.wikimedia.org/;,
"timeout": 10,
-   "prefix": "enwiki"
+   "prefix": "enwiki",
+   "domain": "en.wikipedia.org"
},
"ContentTranslationDatabase": null,

[MediaWiki-commits] [Gerrit] Add missing apihelp messages - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Add missing apihelp messages
..


Add missing apihelp messages

Change-Id: I5cbaaaefbd6a9b023ef576b733035e8ee23de5df
---
M i18n/api/en.json
M i18n/api/qqq.json
2 files changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/i18n/api/en.json b/i18n/api/en.json
index e9aab7f..43ded90 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -25,6 +25,9 @@
"apihelp-cxpublish-param-wpCaptchaWord": "Answer to the captcha (when 
saving with a captcha response).",
"apihelp-query+contenttranslation-description": "Query Content 
Translation database for translations.",
"apihelp-query+contenttranslation-param-translationid": "Translation 
ID.",
+   "apihelp-query+contenttranslation-param-from": "The source language 
code.",
+   "apihelp-query+contenttranslation-param-to": "The target language 
code.",
+   "apihelp-query+contenttranslation-param-sourcetitle": "The title of the 
source page.",
"apihelp-query+contenttranslation-example-1": "Get translations started 
by the current user.",
"apihelp-query+contenttranslation-example-2": "Get translations draft 
by ID.",
"apihelp-query+contenttranslation-example-3": "Find any translation for 
the given title between given language pair",
@@ -33,9 +36,13 @@
"apihelp-cxconfiguration-param-from": "The source language code.",
"apihelp-cxconfiguration-param-to": "The target language code.",
"apihelp-cxconfiguration-example-1": "Fetch the Content Translation 
configuration json for Spanish-Catalan language pair",
+   "apihelp-query+contenttranslationsuggestions-param-from": "The source 
language code.",
+   "apihelp-query+contenttranslationsuggestions-param-to": "The target 
language code.",
+   "apihelp-query+contenttranslationsuggestions-example-1": "Fetch pages 
suggested for translation from English (en) to Spanish (es).",
"apihelp-query+cxpublishedtranslations-description": "Fetch all 
published translations information",
"apihelp-query+cxpublishedtranslations-param-from": "The source 
language code.",
"apihelp-query+cxpublishedtranslations-param-to": "The target language 
code.",
+   "apihelp-query+cxpublishedtranslations-param-limit": "The maximum 
number of translations to fetch.",
"apihelp-query+cxpublishedtranslations-example-1": "Fetch all published 
translations",
"apihelp-query+cxpublishedtranslations-example-2": "Fetch all published 
translations, translated from English",
"apihelp-query+cxpublishedtranslations-example-3": "Fetch all published 
translations, translated from English to Spanish",
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index 74e71f4..c43a151 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -20,6 +20,9 @@
"apihelp-cxpublish-param-wpCaptchaWord": 
"{{doc-apihelp-param|cxpublish|wpCaptchaWord}}",
"apihelp-query+contenttranslation-description": 
"{{doc-apihelp-description|query+contenttranslation}}",
"apihelp-query+contenttranslation-param-translationid": 
"{{doc-apihelp-param|query+contenttranslation|translationid}}",
+   "apihelp-query+contenttranslation-param-from": 
"{{doc-apihelp-param|query+contenttranslation|from}}",
+   "apihelp-query+contenttranslation-param-to": 
"{{doc-apihelp-param|query+contenttranslation|to}}",
+   "apihelp-query+contenttranslation-param-sourcetitle": 
"{{doc-apihelp-param|query+contenttranslation|sourcetitle}}",
"apihelp-query+contenttranslation-example-1": 
"{{doc-apihelp-example|query+contenttranslation}}",
"apihelp-query+contenttranslation-example-2": 
"{{doc-apihelp-example|query+contenttranslation}}",
"apihelp-query+contenttranslation-example-3": 
"{{doc-apihelp-example|query+contenttranslation}}",
@@ -28,9 +31,13 @@
"apihelp-cxconfiguration-param-from": 
"{{doc-apihelp-param|cxconfiguration|from}}",
"apihelp-cxconfiguration-param-to": 
"{{doc-apihelp-param|cxconfiguration|to}}",
"apihelp-cxconfiguration-example-1": 
"{{doc-apihelp-example|cxconfiguration}}",
+   "apihelp-query+contenttranslationsuggestions-param-from": 
"{{doc-apihelp-example|query+contenttranslationsuggestions|from}}",
+   "apihelp-query+contenttranslationsuggestions-param-to": 
"{{doc-apihelp-example|query+contenttranslationsuggestions|to}}",
+   "apihelp-query+contenttranslationsuggestions-example-1": 
"{{doc-apihelp-example|query+contenttranslationsuggestions}}",
"apihelp-query+cxpublishedtranslations-description": 
"{{doc-apihelp-description|query+cxpublishedtranslations}}",
"apihelp-query+cxpublishedtranslations-param-from": 
"{{doc-apihelp-param|query+cxpublishedtranslations|from}}",
"apihelp-query+cxpublishedtranslations-param-to": 

[MediaWiki-commits] [Gerrit] Disable l10n tests by default - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: Disable l10n tests by default
..


Disable l10n tests by default

The pywikibot-i18n repository now runs l10n tests on travis.

Change-Id: I91ee6719c68bf6668749cd7857dd6634aa1f4c73
---
M tests/__init__.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tests/__init__.py b/tests/__init__.py
index aea59f6..053eb5b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -124,6 +124,7 @@
 'tests',  # tests of the tests package
 # weblib is deprecated, the tests fail for weblib,
 # but the tests are run in weblinkchecker_tests.
+'l10n',
 'weblib',
 ]
 if not i18n.messages_available():

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91ee6719c68bf6668749cd7857dd6634aa1f4c73
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add formatterURL to the wb_property_info table - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Add formatterURL to the wb_property_info table
..


Add formatterURL to the wb_property_info table

The setting formatterUrlProperty can be set to a property like
P1630 to define a formatter URL which is used to link identifiers.

Bug: T95285
Change-Id: I363e38f8324863caf4da3635fef6432eaa24535c
---
M docs/options.wiki
M lib/includes/store/PropertyInfoStore.php
M repo/config/Wikibase.default.php
M repo/includes/PropertyInfoBuilder.php
M repo/includes/WikibaseRepo.php
M repo/includes/content/PropertyHandler.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/includes/store/sql/SqlStore.php
M repo/maintenance/rebuildPropertyInfo.php
M repo/tests/phpunit/includes/PropertyInfoBuilderTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
M repo/tests/phpunit/includes/store/sql/PropertyInfoTableBuilderTest.php
12 files changed, 166 insertions(+), 21 deletions(-)

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



diff --git a/docs/options.wiki b/docs/options.wiki
index a43bea0..5da347a 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -57,6 +57,7 @@
 :;length: the maximum length of the string, in characters.
 :Default: array( 'length' => 250 )
 ;useRedirectTargetColumn: Whether to use the epp_redirect_target column in the 
wb_entity_per_page table for detecting redirects. True per default, can be set 
to false in an environment where the necessary database update can't be 
deployed right away. To set up the table manually, run 
repo/sql/AddEppRedirectTarget.sql to create it, then use 
repo/maintenance/rebuildEntityPerPage.php to rebuild the table if neccessary.
+;formatterUrlProperty: Property to be used on properties that defines a 
formatter URL which is used to link identifiers. The placeholder 
$1 will be replaced by the identifier. Example: 
https://www.wikidata.org/entity/$1
 ;transformLegacyFormatOnExport: Whether entity revisions stored in a legacy 
format should be converted on the fly while exporting. Enabled per default.
 ;subscriptionLookupMode: how the repo determines which clients need to be 
notified about changes to which entity (see also the 
useLegacyChangesSubscription setting in the client). Possible values:
 :;'sitelinks': Use only sitelinks from the wb_items_per_site 
table to track subscriptions (legacy mode).
diff --git a/lib/includes/store/PropertyInfoStore.php 
b/lib/includes/store/PropertyInfoStore.php
index fe0cbdc..d27a8c5 100644
--- a/lib/includes/store/PropertyInfoStore.php
+++ b/lib/includes/store/PropertyInfoStore.php
@@ -19,6 +19,11 @@
const KEY_DATA_TYPE = 'type';
 
/**
+* Key to use in the info array for the property's formatter URL
+*/
+   const KEY_FORMATTER_URL = 'formatterURL';
+
+   /**
 * Returns the property info for the given property ID.
 *
 * @note: Even if the property is known to exist, this method may not 
return
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 2309e65..5af6918 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -83,6 +83,9 @@
return $uri;
},
 
+   // Property used as formatter to link identifiers
+   'formatterUrlProperty' => null,
+
// Determines how subscription lookup is handled. Possible 
values:
//
// - 'sitelinks': Use only sitelinks to determine which wiki is 
subscribed to which entity.
diff --git a/repo/includes/PropertyInfoBuilder.php 
b/repo/includes/PropertyInfoBuilder.php
index e939050..b87b16d 100644
--- a/repo/includes/PropertyInfoBuilder.php
+++ b/repo/includes/PropertyInfoBuilder.php
@@ -3,7 +3,12 @@
 
 namespace Wikibase;
 
+use DataValues\StringValue;
 use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementList;
 
 /**
  * Class to build the information about a property.
@@ -16,13 +21,61 @@
 class PropertyInfoBuilder {
 
/**
+* @var PropertyId|null
+*/
+   private $formatterUrlProperty = null;
+
+   /**
+* @param PropertyId|null $formatterUrlProperty
+*/
+   public function __construct( PropertyId $formatterUrlProperty = null ) {
+   $this->formatterUrlProperty = $formatterUrlProperty;
+   }
+
+   /**
 * @param Property $property
 * @return array
 */
public function buildPropertyInfo( Property $property ) {
-   return array(
+   $info = array(
PropertyInfoStore::KEY_DATA_TYPE => 
$property->getDataTypeId()
);
+
+   $formatterUrl = 

[MediaWiki-commits] [Gerrit] BsCommonAJAXInterface: Fixed issue with special Characters - change (mediawiki...BlueSpiceFoundation)

[Dvogel hallowelt (Code Review)]

Dvogel hallowelt has uploaded a new change for review.

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

Change subject: BsCommonAJAXInterface: Fixed issue with special Characters
..

BsCommonAJAXInterface: Fixed issue with special Characters

Function getTitleStoreData replaced strtolower with
SearchEngine::normalizeText because strtolower is not compatible to
multibyte characters.

Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
---
M includes/CommonAJAXInterface.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 8cc321b..08d26d1 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -98,9 +98,10 @@
// so multi term queries also bring results
$sOp = $dbr->anyString();
$aLike = array( '', $sOp );
-   $sParams = explode( ' ', strtolower( $oQueryTitle->getText() ) 
);
-   foreach ( $sParams as $sParam ) {
-   $aLike[] = $sParam;
+   $aParams = explode( ' ', $oQueryTitle->getText() );
+   $oSearchEngine = SearchEngine::create();
+   foreach ( $aParams as $sParam ) {
+   $aLike[] = $oSearchEngine->normalizeText($sParam);
$aLike[] = $sOp;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] apertium: Add new language pairs - change (operations/puppet)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: apertium: Add new language pairs
..

apertium: Add new language pairs

* apertium-ca-it
* apertium-eo-ca
* apertium-eo-es
* apertium-eo-fr
* apertium-fr-ca

Change-Id: I3317d9fb3cd4e7ceefea29678a083a6acbd3cdbd
---
M modules/apertium/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/236004/1

diff --git a/modules/apertium/manifests/init.pp 
b/modules/apertium/manifests/init.pp
index 88b6a5c..feb4bb1 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -26,13 +26,17 @@
 'apertium',
 'apertium-af-nl',
 'apertium-apy',
+'apertium-ca-it',
 'apertium-cy-en',
 'apertium-dan',
 'apertium-dan-nor',
 'apertium-en-ca',
 'apertium-en-es',
 'apertium-en-gl',
+'apertium-eo-ca'
 'apertium-eo-en',
+'apertium-eo-es',
+'apertium-eo-fr',
 'apertium-es-an',
 'apertium-es-ast',
 'apertium-es-ca',
@@ -41,6 +45,7 @@
 'apertium-eu-en',
 'apertium-eu-es',
 'apertium-eus',
+'apertium-fr-ca',
 'apertium-fr-es',
 'apertium-hbs',
 'apertium-hin',

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

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

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

[MediaWiki-commits] [Gerrit] Implement list-server-groups command - change (operations...debdeploy)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Implement list-server-groups command
..

Implement list-server-groups command

Implement list-server-groups command to show which server groups still
need an update.

Also fixes restart of salt-master in postinst

Change-Id: Ie403603b551af9dbda392954723474927e629e36
---
M debian/changelog
M debian/debdeploy-master.postinst
M docs/readme.txt
M master/debdeploy
4 files changed, 59 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/debdeploy 
refs/changes/09/236009/1

diff --git a/debian/changelog b/debian/changelog
index 7784bd1..0a9e091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debdeploy (0.0.4-1) jessie-wikimedia; urgency=medium
+
+  * Implement list-server-groups command
+  * Fix restart of salt-master
+
+ -- Moritz Muehlenhoff   Fri, 04 Sep 2015 13:37:23 
+0200
+
 debdeploy (0.0.3-1) jessie-wikimedia; urgency=medium
 
   * Remove some currently unused imports
diff --git a/debian/debdeploy-master.postinst b/debian/debdeploy-master.postinst
index fbebfc9..a8c6216 100644
--- a/debian/debdeploy-master.postinst
+++ b/debian/debdeploy-master.postinst
@@ -5,7 +5,7 @@
 then
 systemctl restart salt-master.service
 else
-service restart salt-master
+service salt-master restart
 fi
 
 #DEBHELPER#
diff --git a/docs/readme.txt b/docs/readme.txt
index eec1418..6add055 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -127,6 +127,15 @@
 
 debdeploy status-rollback -u elinks.yaml -s testsystem
 
+If you have an updatespec which applies to more than one group of
+servers (which will usually be the case for generic systems libs
+etc), you can check which server groups haven't had the update
+applied:
+
+debdeploy list-server-groups -u dpkg.yaml
+
+
+
 
 Restart detection / handling
 
diff --git a/master/debdeploy b/master/debdeploy
index 0cd8ee6..5912645 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -274,6 +274,40 @@
 print proc, "wasn't running on on", c_stopped[proc], "out of", c, 
"hosts."
 
 
+def list_server_groups(update=None):
+'''
+List all available server groups
+
+update  : If an update is specified, it is displayed whether an update
+  has already been deployed for that group.
+'''
+
+if not update:
+for servergroup in sorted(conf.server_groups):
+print servergroup
+else:
+done_list = []
+missing_list = []
+
+for servergroup in conf.server_groups:
+job_ran = False
+for grain in conf.server_groups[servergroup]:
+if joblogdb.does_job_exist(update, grain):
+job_ran = True
+if job_ran:
+done_list.append(servergroup)
+else:
+missing_list.append(servergroup)
+
+print update, "has been applied to these server groups:"
+for i in sorted(done_list):
+print i
+
+print
+print update, "hasn't been applied to these server groups:"
+for i in sorted(missing_list):
+print i
+
 def rollback(grains, update_file):
 '''
 Trigger process restarts for a set of servers
@@ -319,7 +353,8 @@
   status-deploy: Query the status of a software deployment, requires 
--update and --servers\n \
   rollback : Rollback a software deployment\n \
   status-rollback  : Query the status of a software deployment rollback\n \
-  list-server-groups   : Display a list of all defined server groups \n \
+  list-server-groups   : Display a list of all defined server groups. If an 
update file is listed \n \
+ in addition, it shows whether an update has been 
applied for that group. \n \
   check-missing: Display a list of all servers which don't have an 
update installed \n \
   pkgdb-source : Re-read the package status of a given host into the 
package database")
 
@@ -366,6 +401,12 @@
 elif command == "rollback":
 rollback(conf.server_groups[opt.serverlist], opt.updatefile)
 
+elif command == "list-server-groups":
+if opt.updatefile:
+list_server_groups(opt.updatefile)
+else:
+list_server_groups()
+
 sys.exit(0)
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie403603b551af9dbda392954723474927e629e36
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Use the VirtualRESTService to configure CX - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Use the VirtualRESTService to configure CX
..

Use the VirtualRESTService to configure CX

This allows CX to use either Parsoid or RESTBase via the VRS, and
to share its configuration with Visual Editor.

Bug: T111490
Change-Id: I33bc150fa302d9523df92e9e8a258a19b63847f5
---
M api/ApiContentTranslationPublish.php
M extension.json
2 files changed, 53 insertions(+), 8 deletions(-)


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

diff --git a/api/ApiContentTranslationPublish.php 
b/api/ApiContentTranslationPublish.php
index 7728ebb..f5366fb 100755
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -24,15 +24,59 @@
protected $serviceClient;
 
public function __construct( ApiMain $main, $name ) {
-   global $wgContentTranslationParsoid;
parent::__construct( $main, $name );
$this->serviceClient = new VirtualRESTServiceClient( new 
MultiHttpClient( array() ) );
-   $parsoidConfig = $wgContentTranslationParsoid;
-   $this->serviceClient->mount( '/parsoid/', new 
ParsoidVirtualRESTService( array(
-   'URL' => $parsoidConfig['url'],
-   'prefix' => $parsoidConfig['prefix'],
-   'timeout' => $parsoidConfig['timeout'],
-   ) ) );
+   $this->serviceClient->mount( '/parsoid/', $this->getVRSObject() 
);
+   }
+
+   /**
+* Creates the virtual REST service object to be used in CX's API 
calls. The
+* method determines whether to instantiate a ParsoidVirtualRESTService 
or a
+* RestbaseVirtualRESTService object based on configuration directives: 
if
+* $wgVirtualRestConfig['modules']['restbase'] is defined, RESTBase is 
chosen,
+* otherwise Parsoid is used (either by using the MW Core config, or the
+* VE-local one).
+*
+* @return VirtualRESTService the VirtualRESTService object to use
+*/
+   private function getVRSObject() {
+   // the params array to create the service object with
+   $params = array();
+   // the VRS class to use, defaults to Parsoid
+   $class = 'ParsoidVirtualRESTService';
+   $config = $this->getConfig();
+   // the global virtual rest service config object, if any
+   $vrs = $this->getConfig()->get( 'VirtualRestConfig' );
+   if ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['restbase'] ) ) {
+   // if restbase is available, use it
+   $params = $vrs['modules']['restbase'];
+   $class = 'RestbaseVirtualRESTService';
+   // remove once VE generates restbase paths
+   $params['parsoidCompat'] = true;
+   } elseif ( isset( $vrs['modules'] ) && isset( 
$vrs['modules']['parsoid'] ) ) {
+   // there's a global parsoid config, use it next
+   $params = $vrs['modules']['parsoid'];
+   } else {
+   // no global modules defined, fall back to old defaults
+   $params = array(
+   'URL' => $config->get( 
'ContentTranslationParsoid' )['url'],
+   'prefix' => $config->get( 
'ContentTranslationParsoid' )['prefix'],
+   'domain' => $config->get( 
'ContentTranslationParsoid' )['domain'],
+   'timeout' => $config->get( 
'ContentTranslationParsoid' )['timeout'],
+   );
+   }
+   // merge the global and service-specific params
+   if ( isset( $vrs['global'] ) ) {
+   $params = array_merge( $vrs['global'], $params );
+   }
+   // set up cookie forwarding
+   if ( $params['forwardCookies'] && !User::isEveryoneAllowed( 
'read' ) ) {
+   $params['forwardCookies'] = 
RequestContext::getMain()->getRequest()->getHeader( 'Cookie' );
+   } else {
+   $params['forwardCookies'] = false;
+   }
+   // create the VRS object and return it
+   return new $class( $params );
}
 
private function requestParsoid( $method, $path, $params ) {
diff --git a/extension.json b/extension.json
index b8910ae..a8e1a8e 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,8 @@
"ContentTranslationParsoid": {
"url": "http://parsoid-lb.eqiad.wikimedia.org/;,
"timeout": 10,
-   "prefix": "enwiki"
+ 

[MediaWiki-commits] [Gerrit] Disable l10n tests by default - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Disable l10n tests by default
..

Disable l10n tests by default

The pywikibot-i18n repository now runs l10n tests on travis.

Change-Id: I91ee6719c68bf6668749cd7857dd6634aa1f4c73
---
M tests/__init__.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/94/235994/1

diff --git a/tests/__init__.py b/tests/__init__.py
index aea59f6..053eb5b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -124,6 +124,7 @@
 'tests',  # tests of the tests package
 # weblib is deprecated, the tests fail for weblib,
 # but the tests are run in weblinkchecker_tests.
+'l10n',
 'weblib',
 ]
 if not i18n.messages_available():

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ee6719c68bf6668749cd7857dd6634aa1f4c73
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Remove unnecessary overrides path() and apipath() - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Remove unnecessary overrides path() and apipath()
..

Remove unnecessary overrides path() and apipath()

The base class implements these methods using scriptpath()

Change-Id: I3fe70d235e7912073504d8b512119f080dcfef77
---
M pywikibot/families/anarchopedia_family.py
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/03/236003/1

diff --git a/pywikibot/families/anarchopedia_family.py 
b/pywikibot/families/anarchopedia_family.py
index f67914d..311fdb8 100644
--- a/pywikibot/families/anarchopedia_family.py
+++ b/pywikibot/families/anarchopedia_family.py
@@ -81,11 +81,3 @@
 def scriptpath(self, code):
 """Return the script path for this family."""
 return ''
-
-def path(self, code):
-"""Return the path to index.php for this family."""
-return '/index.php'
-
-def apipath(self, code):
-"""Return the path to api.php for this family."""
-return '/api.php'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fe70d235e7912073504d8b512119f080dcfef77
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Fix download data link in footer - change (wikimedia/TransparencyReport)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review.

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

Change subject: Fix download data link in footer
..

Fix download data link in footer

Change-Id: Id738e039953fb10bf76f40468483bcad6c478d46
---
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/index.html
M build/privacy.html
M build/stories.html
M source/layouts/layout.erb
11 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/07/236007/1

diff --git a/build/content.html b/build/content.html
index 2d3a9c1..ba581fd 100644
--- a/build/content.html
+++ b/build/content.html
@@ -493,7 +493,7 @@


Wiki 
Version
-   Download Data
+   Download Data
Privacy Policy
Data Retention 
Guidelines

diff --git a/build/faq.html b/build/faq.html
index 4d2d5c4..dfa9503 100644
--- a/build/faq.html
+++ b/build/faq.html
@@ -247,7 +247,7 @@


Wiki 
Version
-   Download Data
+   Download Data
Privacy Policy
Data Retention 
Guidelines

diff --git a/build/fr/content.html b/build/fr/content.html
index 00d9c12..adc3875 100644
--- a/build/fr/content.html
+++ b/build/fr/content.html
@@ -493,7 +493,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/faq.html b/build/fr/faq.html
index 2c988b8..6018d95 100644
--- a/build/fr/faq.html
+++ b/build/fr/faq.html
@@ -247,7 +247,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/index.html b/build/fr/index.html
index 4880922..e78ac8e 100644
--- a/build/fr/index.html
+++ b/build/fr/index.html
@@ -118,7 +118,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/privacy.html b/build/fr/privacy.html
index 82979f3..eff3104 100644
--- a/build/fr/privacy.html
+++ b/build/fr/privacy.html
@@ -391,7 +391,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/stories.html b/build/fr/stories.html
index 744ca3c..f153e6a 100644
--- a/build/fr/stories.html
+++ b/build/fr/stories.html
@@ -271,7 +271,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

[MediaWiki-commits] [Gerrit] Do language formatting on numbers in [[Special:TimedMediaHan... - change (mediawiki...TimedMediaHandler)

[jenkins-bot (Code Review)]

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

Change subject: Do language formatting on numbers in 
[[Special:TimedMediaHandler]]
..


Do language formatting on numbers in [[Special:TimedMediaHandler]]

At some future point, this should maybe have i18n done as a
parameter to message, instead of just outputting the number,
but that's kind of a separate issue.

Change-Id: I42a711f100f28be5e3914f6ab5d52fa9f1b3f0b9
---
M SpecialTimedMediaHandler.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php
index 0808b18..46f2fef 100644
--- a/SpecialTimedMediaHandler.php
+++ b/SpecialTimedMediaHandler.php
@@ -80,7 +80,7 @@
// timedmedia-derivative-state-queued, 
timedmedia-derivative-state-failed
$out->addHTML(
""
-   . $this->msg( 'timedmedia-derivative-state-' . 
$state, $states[ $state ]['total'] )->escaped()
+   . $this->msg( 'timedmedia-derivative-state-' . 
$state )->numParams( $states[ $state ]['total'] )->escaped()
. ""
);
foreach( $allTranscodes as $key ) {
@@ -88,7 +88,7 @@
&& isset( $states[ $state ][ $key ] )
&& $states[ $state ][ $key ] ) {
$out->addHTML(
-   $states[ $state ][ $key ]
+   htmlspecialchars( 
$this->getLanguage()->formatNum( $states[ $state ][ $key ] ) )
. ' '
. $this->msg( 
'timedmedia-derivative-desc-' . $key )->escaped()
. "" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42a711f100f28be5e3914f6ab5d52fa9f1b3f0b9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Ebrahim 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Browser tests: adjust to actual archive template - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Browser tests: adjust to actual archive template
..

Browser tests: adjust to actual archive template

Change-Id: I64b0f472d239ea3995ba1649f9e42645cf76e0d4
---
M tests/browser/features/step_definitions/opt_in_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/step_definitions/opt_in_steps.rb 
b/tests/browser/features/step_definitions/opt_in_steps.rb
index 7f73af8..5adb12e 100644
--- a/tests/browser/features/step_definitions/opt_in_steps.rb
+++ b/tests/browser/features/step_definitions/opt_in_steps.rb
@@ -29,7 +29,7 @@
 
 Then(/^my previous talk page is archived$/) do
   archive_name = "./User_talk:#{@username}/Archive_1"
-  archive_template = "User_talk:#{@username}".gsub '_', ' '
+  archive_template = 'This page is an archive.'
   visit(WikiPage, using_params: { page: archive_name }) do |page|
 expect(page.content_element.when_present.text).to match @talk_page_content
 expect(page.content_element.when_present.text).to match archive_template

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64b0f472d239ea3995ba1649f9e42645cf76e0d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] Browser tests: Special:EnableFlow without header - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Browser tests: Special:EnableFlow without header
..

Browser tests: Special:EnableFlow without header

* Don't set custom header by default since it is
  not required anymore.

* Test explicitely that a custom header can be
  provided and that it ends up in the Flow
  board description.

Change-Id: Ib2b5a26cd82fd9aaec79ffaba2954f0eb60b7550
---
M tests/browser/features/special_enableflow.feature
M tests/browser/features/step_definitions/special_enable_flow_steps.rb
2 files changed, 23 insertions(+), 1 deletion(-)


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

diff --git a/tests/browser/features/special_enableflow.feature 
b/tests/browser/features/special_enableflow.feature
index d291475..d842512 100644
--- a/tests/browser/features/special_enableflow.feature
+++ b/tests/browser/features/special_enableflow.feature
@@ -16,6 +16,13 @@
 And I click on the new Flow board link
 And The page I am on is a Flow board
 
+  Scenario: Enabling a new Flow page with a custom header
+When I enable a new Flow board with a custom header
+Then I get confirmation for enabling a new Flow board
+And I click on the new Flow board link
+And The page I am on is a Flow board
+And I see the custom header
+
   Scenario: Enabling a Flow page on existing page
 Given I have an existing talk page
 When I enable a new Flow board on the talk page
diff --git 
a/tests/browser/features/step_definitions/special_enable_flow_steps.rb 
b/tests/browser/features/step_definitions/special_enable_flow_steps.rb
index fedffcb..a3addbe 100644
--- a/tests/browser/features/step_definitions/special_enable_flow_steps.rb
+++ b/tests/browser/features/step_definitions/special_enable_flow_steps.rb
@@ -19,7 +19,16 @@
 When(/^I enable a new Flow board on article (.*?)$/) do |article|
   on(EnableFlowPage) do |page|
 page.page_name_element.when_present.send_keys article
-page.page_header_element.when_present.send_keys 'header'
+page.submit
+  end
+end
+
+When(/^I enable a new Flow board with a custom header$/) do
+  @new_board_page = @data_manager.get_talk 'Test_Random_Board'
+  @custom_header = @data_manager.get 'custom header'
+  on(EnableFlowPage) do |page|
+page.page_name_element.when_present.send_keys @new_board_page
+page.page_header_element.when_present.send_keys @custom_header
 page.submit
   end
 end
@@ -50,3 +59,9 @@
 Then(/^The archive contains the original text$/) do
   
expect(on(SpecialConversionFlowArchivePage).content_element.when_present.text).to
 match('Some wikitext here.')
 end
+
+Then(/^I see the custom header$/) do
+  on(AbstractFlowPage) do |page|
+page.description.content_element.when_present.text.should match 
@custom_header
+  end
+end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2b5a26cd82fd9aaec79ffaba2954f0eb60b7550
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] Add jscs and jshint tasks to the Gruntfile - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

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

Change subject: Add jscs and jshint tasks to the Gruntfile
..


Add jscs and jshint tasks to the Gruntfile

Adds the jscs and jshint packages for development and their tasks in
Grunt. Also fixes all the code convention errors.

Change-Id: If1c9dfdbe22d4912d78b6a51b1292866970a85cc
---
A .jscsrc
M Gruntfile.js
M package.json
M resources/ext.popups.core.js
M resources/ext.popups.disablenavpop.js
M resources/ext.popups.logger.js
M resources/ext.popups.renderer.article.js
M resources/ext.popups.renderer.js
M resources/ext.popups.settings.js
M tests/qunit/ext.popups.core.test.js
M tests/qunit/ext.popups.renderer.article.test.js
11 files changed, 103 insertions(+), 86 deletions(-)

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



diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..a031ea4
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..2b95ad9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,22 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jscs: {
+   src: 'resources/*.js'
+   },
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [ 'resources/*.js' ]
},
jsonlint: {
all: [
@@ -15,6 +26,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 063f93f..589eed3 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,10 @@
   },
   "devDependencies": {
 "grunt": "0.4.5",
-"grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.2.2",
+"grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.2",
+"grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4"
   }
 }
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index f29c52e..2b2ce8d 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -15,7 +15,7 @@
 * Set to false on Internet Explorer because adding SVGs
 * through JavaScript in IE is failing. Thus, falling back to PNGs
 *
-* @property {Boolean} supportsSVG
+* @property {boolean} supportsSVG
 */
mw.popups.supportsSVG = ( $.client.profile().name === 'msie' ) ?
false :
@@ -29,7 +29,7 @@
 
/**
 * Whether the page is being scrolled.
-* @property {Boolean} scrolled
+* @property {boolean} scrolled
 */
mw.popups.scrolled = false;
 
@@ -90,7 +90,7 @@
mw.popups.$popup = $( '' )
.attr( {
'class': 'mwe-popups',
-   'role': 'tooltip',
+   role: 'tooltip',
'aria-hidden': 'true'
} )
.appendTo( document.body );
@@ -186,7 +186,7 @@
titleRegex = new RegExp( mw.RegExp.escape( 
mw.config.get( 'wgArticlePath' ) )
.replace( '\\$1', '(.+)' ) );
matches = titleRegex.exec( linkHref.path );
-   return matches ? decodeURIComponent( matches[1] ) : 
undefined;
+   return matches ? decodeURIComponent( matches[ 1 ] ) : 
undefined;
}
};
 
@@ -198,7 +198,7 @@
mw.popups.selectPopupElements = function () {
var contentNamespaces = mw.config.get( 'wgContentNamespaces' );
return mw.popups.$content
-   .find( 'a[href][title]:not(' + 
mw.popups.IGNORE_CLASSES.join(', ') + ')' )
+   .find( 'a[href][title]:not(' + 
mw.popups.IGNORE_CLASSES.join( ', ' ) + ')' )
.filter( function () {
var title,
titleText = mw.popups.getTitle( 
this.href );
@@ -211,9 +211,10 @@
} );
};
 
-   mw.hook( 'wikipage.content').add( function ( $content ) {
+   mw.hook( 'wikipage.content' ).add( function ( $content ) {
+   var $elements;
mw.popups.$content = $content;
-   

[MediaWiki-commits] [Gerrit] Add l10n testing using pywikibot - change (pywikibot/i18n)

[jenkins-bot (Code Review)]

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

Change subject: Add l10n testing using pywikibot
..


Add l10n testing using pywikibot

Change-Id: Iff5910371cee8ebe3e82aff5ec88a88568fd82b7
---
A .travis.yml
1 file changed, 22 insertions(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..907dcd2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+language: python
+
+sudo: false
+
+python:
+  - '3.4'
+
+env:
+  - PYWIKIBOT2_NO_USER_CONFIG=2
+
+before_install:
+  - git clone https://github.com/wikimedia/pywikibot-core
+  - mkdir -p pywikibot-core/scripts/i18n
+  - touch pywikibot-core/scripts/i18n/__init__.py
+  - for item in *; do if [[ -d "$item" ]]; then cp -rp "$item" 
pywikibot-core/scripts/i18n; fi; done
+
+install:
+  - pip install six nose requests
+
+script:
+  - cd pywikibot-core
+  - nosetests --verbosity=2 tests.l10n_tests

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff5910371cee8ebe3e82aff5ec88a88568fd82b7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SmartList: fixed whitespace error in toplist - change (mediawiki...BlueSpiceExtensions)

[jenkins-bot (Code Review)]

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

Change subject: SmartList: fixed whitespace error in toplist
..


SmartList: fixed whitespace error in toplist

Categories with whitespaces were not recognized. User had to use _
instead. This problem is fixed.

Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
---
M SmartList/SmartList.class.php
1 file changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index e712725..0390363 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -1100,23 +1100,19 @@
}
 
if ( !empty( $sCat ) ) {
-   if ( substr_count( $sCat , ',') > 0 ) {
-   $aCategories = explode( ',', $sCat );
-   $aCategories = array_map( 'trim', $aCategories 
);
-   $sCategory = $aCategories[0];
-   } else {
-   $sCategory = $sCat;
-   }
+   $aCategories = explode( ',', $sCat );
+   $aCategories = array_map('trim', $aCategories);
+   $aCategories = str_replace(' ', '_',$aCategories);
 
if ( $bAlltime === false ) {
$aColumns[] = 'wo_page_id';
$aJoinConditions = array( 'categorylinks' => 
array( 'INNER JOIN ', 'wo_page_id = cl_from' ) );
$aTables[]= 'categorylinks';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
} else {
$aTables[]= 'categorylinks';
$aConditions[]= 'page_id = cl_from';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
}
}
 
@@ -1150,6 +1146,7 @@
}
 
$aList = array();
+   $aInList = array();
$iCurrCount = 0;
if ( $bAlltime === false ) {
foreach ( $res as $row ) {
@@ -1166,7 +1163,10 @@
continue;
}
}
-
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[''. $sLink . ' (' . 
$row->page_counter . ')'] = (int)$row->page_counter;
$iCurrCount++;
@@ -1189,6 +1189,11 @@
if ( !empty( $aResult ) ) 
continue;
}
 
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
+
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[] = '' . $sLink . ' (' . 
$row->page_counter . ')';
$iCurrCount++;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Reduce Android emulator boot time - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Reduce Android emulator boot time
..


Reduce Android emulator boot time

Preserve the Android emulator and snapshot used between builds to
improve start up performance. Initial testing shows about a minute and a
half reduction, 5:28 before[0] and 3:52 after[1] for an entire test run.

[0] https://integration.wikimedia.org/ci/job/test-T62720-android-emulator/85/
[1] https://integration.wikimedia.org/ci/job/test-T62720-android-emulator/87/

Updates apps-android-wikipedia-gradlew

Change-Id: Ib21fde99dc22aca6ca681c518f552c21e7839e6d
---
M jjb/mobile.yaml
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index 6e93aaa..e850123 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -24,8 +24,9 @@
  - android-emulator:
  os: android-15
  target-abi: x86
- wipe: true
- delete: true
+ wipe: false
+ delete: false
+ snapshot: true
  commandline-options: '-noaudio'
  screen-density: 240
  screen-resolution: WVGA

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib21fde99dc22aca6ca681c518f552c21e7839e6d
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
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] Add docstring to l10n tests - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Add docstring to l10n tests
..

Add docstring to l10n tests

Bug: T111498
Change-Id: I2362af15fe5bb4ba0a1316983b758a80da35658d
---
M tests/l10n_tests.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/95/235995/1

diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py
index 1e81b21..2ba01f3 100644
--- a/tests/l10n_tests.py
+++ b/tests/l10n_tests.py
@@ -69,6 +69,8 @@
 current_site = pywikibot.Site(code, dct['family'])
 test_name = ("test_%s_%s" % (package, code)).replace('-', '_')
 dct[test_name] = test_method(current_site)
+dct[test_name].__doc__ = 'Test {0} with language {1}'.format(
+package, code))
 return super(TestValidTemplateMeta, cls).__new__(cls, name, bases, dct)
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2362af15fe5bb4ba0a1316983b758a80da35658d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Bump Schema:Edit to revision 13457736 - change (mediawiki...WikiEditor)

[jenkins-bot (Code Review)]

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

Change subject: Bump Schema:Edit to revision 13457736
..


Bump Schema:Edit to revision 13457736

Bug: T111421
Change-Id: Ib5fc6004482b7324fc52acd7d28ad2b1529e55a3
---
M WikiEditor.hooks.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index 0732457..ccb5448 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -190,7 +190,6 @@
'editor' => 'wikitext',
'platform' => 'desktop', // FIXME
'integration' => 'page',
-   'page.length' => -1, // FIXME
'page.id' => $page->getId(),
'page.title' => $title->getPrefixedText(),
'page.ns' => $title->getNamespace(),
@@ -204,7 +203,7 @@
$data['user.class'] = 'IP';
}
 
-   return EventLogging::logEvent( 'Edit', 11448630, $data );
+   return EventLogging::logEvent( 'Edit', 13457736, $data );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5fc6004482b7324fc52acd7d28ad2b1529e55a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix WikiPageEntityRedirectLookup::getRedirectForEntityId for... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix WikiPageEntityRedirectLookup::getRedirectForEntityId for 
items in main NS
..


Fix WikiPageEntityRedirectLookup::getRedirectForEntityId for items in main NS

Also added test case for this.

Bug: T111342
Change-Id: Ia9ee92c18c225b99b155d366a0fbef351acee225
---
M repo/includes/store/sql/WikiPageEntityRedirectLookup.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityRedirectLookupTest.php
2 files changed, 71 insertions(+), 1 deletion(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  Jeroen De Dauw: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/includes/store/sql/WikiPageEntityRedirectLookup.php 
b/repo/includes/store/sql/WikiPageEntityRedirectLookup.php
index 5ad3224..85c9e6a 100644
--- a/repo/includes/store/sql/WikiPageEntityRedirectLookup.php
+++ b/repo/includes/store/sql/WikiPageEntityRedirectLookup.php
@@ -128,7 +128,7 @@
return false;
}
 
-   if ( !$row->rd_namespace ) {
+   if ( $row->rd_namespace === null ) {
return null;
}
 
diff --git 
a/repo/tests/phpunit/includes/store/sql/WikiPageEntityRedirectLookupTest.php 
b/repo/tests/phpunit/includes/store/sql/WikiPageEntityRedirectLookupTest.php
index 68f5137..585bda0 100644
--- a/repo/tests/phpunit/includes/store/sql/WikiPageEntityRedirectLookupTest.php
+++ b/repo/tests/phpunit/includes/store/sql/WikiPageEntityRedirectLookupTest.php
@@ -4,6 +4,8 @@
 
 use LoadBalancer;
 use MediaWikiTestCase;
+use Title;
+use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
@@ -81,6 +83,74 @@
$this->assertNull( $res );
}
 
+   public function testGetRedirectForEntityId_itemsInMainNamespace() {
+   $row = array(
+   'page_id' => 10,
+   'rd_namespace' => NS_MAIN,
+   'rd_title' => 'Q10'
+   );
+
+   $entityRedirectLookup = new WikiPageEntityRedirectLookup(
+   $this->getMockEntityTitleLookup(),
+   $this->getMockEntityIdLookup(),
+   $this->getMockLoadBalancer( $row )
+   );
+
+   $redirect = $entityRedirectLookup->getRedirectForEntityId( new 
ItemId( 'Q2' ) );
+
+   $this->assertEquals( new ItemId( 'Q10' ), $redirect );
+   }
+
+   private function getMockEntityTitleLookup() {
+   $entityTitleLookup = $this->getMock( 
'\Wikibase\Lib\Store\EntityTitleLookup' );
+
+   $entityTitleLookup->expects( $this->any() )
+   ->method( 'getTitleForId' )
+   ->will( $this->returnCallback( function( EntityId 
$entityId ) {
+   return Title::makeTitle( NS_MAIN, 
$entityId->getSerialization() );
+   } ) );
+
+   return $entityTitleLookup;
+   }
+
+   private function getMockEntityIdLookup() {
+   $entityIdLookup = $this->getMock( 
'Wikibase\Store\EntityIdLookup' );
+
+   $entityIdLookup->expects( $this->any() )
+   ->method( 'getEntityIdForTitle' )
+   ->will( $this->returnCallback( function( Title $title ) 
{
+   return new ItemId( $title->getText() );
+   } ) );
+
+   return $entityIdLookup;
+   }
+
+   private function getMockLoadBalancer( array $row ) {
+   $db = $this->getMockDatabase( $row );
+
+   $loadBalancer = $this->getMockBuilder( 'LoadBalancer' )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $loadBalancer->expects( $this->any() )
+   ->method( 'getConnection' )
+   ->will( $this->returnValue( $db ) );
+
+   return $loadBalancer;
+   }
+
+   private function getMockDatabase( array $row ) {
+   $db = $this->getMockBuilder( 'DatabaseMysql' )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $db->expects( $this->any() )
+   ->method( 'selectRow' )
+   ->will( $this->returnValue( (object)$row ) );
+
+   return $db;
+   }
+
public function testGetRedirectIds() {
$res = 
$this->getWikiPageEntityRedirectLookup()->getRedirectIds( $this->itemId );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ee92c18c225b99b155d366a0fbef351acee225
Gerrit-PatchSet: 3
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] BsCommonAJAXInterface: Fixed issue with special Characters - change (mediawiki...BlueSpiceFoundation)

[jenkins-bot (Code Review)]

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

Change subject: BsCommonAJAXInterface: Fixed issue with special Characters
..


BsCommonAJAXInterface: Fixed issue with special Characters

Function getTitleStoreData replaced strtolower with
SearchEngine::normalizeText because strtolower is not compatible to
multibyte characters.

Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
---
M includes/CommonAJAXInterface.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 8cc321b..c383da8 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -98,9 +98,10 @@
// so multi term queries also bring results
$sOp = $dbr->anyString();
$aLike = array( '', $sOp );
-   $sParams = explode( ' ', strtolower( $oQueryTitle->getText() ) 
);
-   foreach ( $sParams as $sParam ) {
-   $aLike[] = $sParam;
+   $aParams = explode( ' ', $oQueryTitle->getText() );
+   $oSearchEngine = SearchEngine::create();
+   foreach ( $aParams as $sParam ) {
+   $aLike[] = $oSearchEngine->normalizeText( $sParam );
$aLike[] = $sOp;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] BsCommonAJAXInterface: Fixed issue with special Characters - change (mediawiki...BlueSpiceFoundation)

[Tweichart (Code Review)]

Tweichart has uploaded a new change for review.

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

Change subject: BsCommonAJAXInterface: Fixed issue with special Characters
..

BsCommonAJAXInterface: Fixed issue with special Characters

Function getTitleStoreData replaced strtolower with
SearchEngine::normalizeText because strtolower is not compatible to
multibyte characters.

Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
---
M includes/CommonAJAXInterface.php
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/06/236006/1

diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 8cc321b..c383da8 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -98,9 +98,10 @@
// so multi term queries also bring results
$sOp = $dbr->anyString();
$aLike = array( '', $sOp );
-   $sParams = explode( ' ', strtolower( $oQueryTitle->getText() ) 
);
-   foreach ( $sParams as $sParam ) {
-   $aLike[] = $sParam;
+   $aParams = explode( ' ', $oQueryTitle->getText() );
+   $oSearchEngine = SearchEngine::create();
+   foreach ( $aParams as $sParam ) {
+   $aLike[] = $oSearchEngine->normalizeText( $sParam );
$aLike[] = $sOp;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] BsCommonAJAXInterface: Fixed issue with special Characters - change (mediawiki...BlueSpiceFoundation)

[jenkins-bot (Code Review)]

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

Change subject: BsCommonAJAXInterface: Fixed issue with special Characters
..


BsCommonAJAXInterface: Fixed issue with special Characters

Function getTitleStoreData replaced strtolower with
SearchEngine::normalizeText because strtolower is not compatible to
multibyte characters.

Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
---
M includes/CommonAJAXInterface.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 8cc321b..c383da8 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -98,9 +98,10 @@
// so multi term queries also bring results
$sOp = $dbr->anyString();
$aLike = array( '', $sOp );
-   $sParams = explode( ' ', strtolower( $oQueryTitle->getText() ) 
);
-   foreach ( $sParams as $sParam ) {
-   $aLike[] = $sParam;
+   $aParams = explode( ' ', $oQueryTitle->getText() );
+   $oSearchEngine = SearchEngine::create();
+   foreach ( $aParams as $sParam ) {
+   $aLike[] = $oSearchEngine->normalizeText( $sParam );
$aLike[] = $sOp;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] LinkBeginHookHandler: compare target with link text Title-wise - change (mediawiki...Wikibase)

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review.

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

Change subject: LinkBeginHookHandler: compare target with link text Title-wise
..

LinkBeginHookHandler: compare target with link text Title-wise

Bug: T104825
Change-Id: I95214bc324f7a51e92fe4b67fb07707d3670b022
---
M repo/includes/Hooks/LinkBeginHookHandler.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/repo/includes/Hooks/LinkBeginHookHandler.php 
b/repo/includes/Hooks/LinkBeginHookHandler.php
index 08f524d..ba3a316 100644
--- a/repo/includes/Hooks/LinkBeginHookHandler.php
+++ b/repo/includes/Hooks/LinkBeginHookHandler.php
@@ -163,7 +163,10 @@
// if custom link text is given, there is no point in 
overwriting it
// but not if it is similar to the plain title
if ( $html !== null && $target->getFullText() !== $html ) {
-   return;
+   $titleFromHtml = Title::newFromText( $html );
+   if ( !is_object( $titleFromHtml ) || 
!$titleFromHtml->equals( $target ) ) {
+   return;
+   }
}
 
$entityId = $this->entityIdLookup->getEntityIdForTitle( $target 
);

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

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

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

[MediaWiki-commits] [Gerrit] grafana: graphite is the default datasource - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: grafana: graphite is the default datasource
..


grafana: graphite is the default datasource

With multiple datasources, when we add a graph panel the interface fails
to pick a datasource and fallback to 'null'.  That causes a stacktrace
in the frontend web interface which prevents the default empty graph
from showing. We end up with a graph panel that does not display and
thus can not be edited.

The grafana v1.9 installation documentation suggests to set one of the
datasources as the default. That might fix the null datasource error.

Reference:
http://docs.grafana.org/v1.9/installation/

Bug: T110317
Change-Id: I781ac6c8fb8730f05e46dd49b5e338c9ee6a4cde
---
M manifests/role/grafana.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 88c5475..0166364 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -13,6 +13,7 @@
 config => {
 datasources => {
 graphite  => {
+'default' => 'true',
 type  => 'graphite',
 url   => "//graphite.${domain_suffix}",
 render_method => 'GET',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I781ac6c8fb8730f05e46dd49b5e338c9ee6a4cde
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Filippo Giunchedi 
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] SmartList: fixed whitespace error in toplist - change (mediawiki...BlueSpiceExtensions)

[Tweichart (Code Review)]

Tweichart has uploaded a new change for review.

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

Change subject: SmartList: fixed whitespace error in toplist
..

SmartList: fixed whitespace error in toplist

Categories with whitespaces were not recognized. User had to use _
instead. This problem is fixed.

Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
---
M SmartList/SmartList.class.php
1 file changed, 15 insertions(+), 10 deletions(-)


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

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index e712725..0390363 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -1100,23 +1100,19 @@
}
 
if ( !empty( $sCat ) ) {
-   if ( substr_count( $sCat , ',') > 0 ) {
-   $aCategories = explode( ',', $sCat );
-   $aCategories = array_map( 'trim', $aCategories 
);
-   $sCategory = $aCategories[0];
-   } else {
-   $sCategory = $sCat;
-   }
+   $aCategories = explode( ',', $sCat );
+   $aCategories = array_map('trim', $aCategories);
+   $aCategories = str_replace(' ', '_',$aCategories);
 
if ( $bAlltime === false ) {
$aColumns[] = 'wo_page_id';
$aJoinConditions = array( 'categorylinks' => 
array( 'INNER JOIN ', 'wo_page_id = cl_from' ) );
$aTables[]= 'categorylinks';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
} else {
$aTables[]= 'categorylinks';
$aConditions[]= 'page_id = cl_from';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
}
}
 
@@ -1150,6 +1146,7 @@
}
 
$aList = array();
+   $aInList = array();
$iCurrCount = 0;
if ( $bAlltime === false ) {
foreach ( $res as $row ) {
@@ -1166,7 +1163,10 @@
continue;
}
}
-
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[''. $sLink . ' (' . 
$row->page_counter . ')'] = (int)$row->page_counter;
$iCurrCount++;
@@ -1189,6 +1189,11 @@
if ( !empty( $aResult ) ) 
continue;
}
 
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
+
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[] = '' . $sLink . ' (' . 
$row->page_counter . ')';
$iCurrCount++;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] SmartList: fixed whitespace error in toplist - change (mediawiki...BlueSpiceExtensions)

[jenkins-bot (Code Review)]

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

Change subject: SmartList: fixed whitespace error in toplist
..


SmartList: fixed whitespace error in toplist

Categories with whitespaces were not recognized. User had to use _
instead. This problem is fixed.

Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
---
M SmartList/SmartList.class.php
1 file changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index acf00a8..13efda7 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -1107,23 +1107,19 @@
}
 
if ( !empty( $sCat ) ) {
-   if ( substr_count( $sCat , ',') > 0 ) {
-   $aCategories = explode( ',', $sCat );
-   $aCategories = array_map( 'trim', $aCategories 
);
-   $sCategory = $aCategories[0];
-   } else {
-   $sCategory = $sCat;
-   }
+   $aCategories = explode( ',', $sCat );
+   $aCategories = array_map('trim', $aCategories);
+   $aCategories = str_replace(' ', '_',$aCategories);
 
if ( $bAlltime === false ) {
$aColumns[] = 'wo_page_id';
$aJoinConditions = array( 'categorylinks' => 
array( 'INNER JOIN ', 'wo_page_id = cl_from' ) );
$aTables[]= 'categorylinks';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
} else {
$aTables[]= 'categorylinks';
$aConditions[]= 'page_id = cl_from';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
}
}
 
@@ -1157,6 +1153,7 @@
}
 
$aList = array();
+   $aInList = array();
$iCurrCount = 0;
if ( $bAlltime === false ) {
foreach ( $res as $row ) {
@@ -1173,7 +1170,10 @@
continue;
}
}
-
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[''. $sLink . ' (' . 
$row->page_counter . ')'] = (int)$row->page_counter;
$iCurrCount++;
@@ -1196,6 +1196,11 @@
if ( !empty( $aResult ) ) 
continue;
}
 
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
+
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[] = '' . $sLink . ' (' . 
$row->page_counter . ')';
$iCurrCount++;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Create PropertyInfoBuilder - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Create PropertyInfoBuilder
..


Create PropertyInfoBuilder

This allows us to centralize the information about
what data is added to the property info table.

Bug: T95285
Change-Id: I77c15d63e1dd4be8c3bfa90ecd719723bb22776b
---
A repo/includes/PropertyInfoBuilder.php
M repo/includes/content/PropertyHandler.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
A repo/tests/phpunit/includes/PropertyInfoBuilderTest.php
4 files changed, 62 insertions(+), 8 deletions(-)

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



diff --git a/repo/includes/PropertyInfoBuilder.php 
b/repo/includes/PropertyInfoBuilder.php
new file mode 100644
index 000..e939050
--- /dev/null
+++ b/repo/includes/PropertyInfoBuilder.php
@@ -0,0 +1,28 @@
+
+ */
+class PropertyInfoBuilder {
+
+   /**
+* @param Property $property
+* @return array
+*/
+   public function buildPropertyInfo( Property $property ) {
+   return array(
+   PropertyInfoStore::KEY_DATA_TYPE => 
$property->getDataTypeId()
+   );
+   }
+
+}
diff --git a/repo/includes/content/PropertyHandler.php 
b/repo/includes/content/PropertyHandler.php
index 41a59e5..0644bff 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -13,6 +13,7 @@
 use Wikibase\EntityContent;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\PropertyContent;
+use Wikibase\PropertyInfoBuilder;
 use Wikibase\PropertyInfoStore;
 use Wikibase\Repo\Store\EntityPerPage;
 use Wikibase\Repo\Validators\EntityConstraintProvider;
@@ -172,11 +173,8 @@
/** @var PropertyContent $content */
$updates = array();
 
-   //XXX: Where to encode the knowledge about how to extract an 
info array from a Property object?
-   // Should we have a PropertyInfo class? Or can we put this 
into the Property class?
-   $info = array(
-   PropertyInfoStore::KEY_DATA_TYPE => 
$content->getProperty()->getDataTypeId()
-   );
+   $propertyInfoBuilder = new PropertyInfoBuilder();
+   $info = $propertyInfoBuilder->buildPropertyInfo( 
$content->getProperty() );
 
$updates[] = new DataUpdateAdapter(
array( $this->infoStore, 'setPropertyInfo' ),
diff --git a/repo/includes/store/sql/PropertyInfoTableBuilder.php 
b/repo/includes/store/sql/PropertyInfoTableBuilder.php
index 014eed2..dba23d0 100644
--- a/repo/includes/store/sql/PropertyInfoTableBuilder.php
+++ b/repo/includes/store/sql/PropertyInfoTableBuilder.php
@@ -29,6 +29,11 @@
private $entityLookup;
 
/**
+* @var PropertyInfoBuilder
+*/
+   private $propertyInfoBuilder;
+
+   /**
 * @var MessageReporter|null
 */
private $reporter = null;
@@ -74,6 +79,7 @@
$this->propertyInfoTable = $propertyInfoTable;
$this->entityLookup = $entityLookup;
$this->useRedirectTargetColumn = $useRedirectTargetColumn;
+   $this->propertyInfoBuilder = new PropertyInfoBuilder();
}
 
/**
@@ -250,9 +256,7 @@
}
 
//FIXME: Needs to be in sync with what 
PropertyHandler::getEntityModificationUpdates does!
-   $info = array(
-   PropertyInfoStore::KEY_DATA_TYPE => 
$property->getDataTypeId()
-   );
+   $info = $this->propertyInfoBuilder->buildPropertyInfo( 
$property );
 
$this->propertyInfoTable->setPropertyInfo(
$property->getId(),
diff --git a/repo/tests/phpunit/includes/PropertyInfoBuilderTest.php 
b/repo/tests/phpunit/includes/PropertyInfoBuilderTest.php
new file mode 100644
index 000..8c2d60b
--- /dev/null
+++ b/repo/tests/phpunit/includes/PropertyInfoBuilderTest.php
@@ -0,0 +1,24 @@
+
+ */
+class PropertyInfoBuilderTest extends \PHPUnit_Framework_TestCase {
+
+   public function testBuildPropertyInfo() {
+   $property = Property::newFromType( 'foo' );
+   $propertyInfoBuilder = new PropertyInfoBuilder();
+
+   $this->assertEquals( array( 'type' => 'foo' ), 
$propertyInfoBuilder->buildPropertyInfo( $property ) );
+   }
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77c15d63e1dd4be8c3bfa90ecd719723bb22776b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] config: Add new Apertium MT pairs - change (mediawiki...cxserver)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: config: Add new Apertium MT pairs
..

config: Add new Apertium MT pairs

* ca -> eo
* ca <-> fr
* es -> eo
* fr -> eo
* it -> ca

Change-Id: Id5f6ba9d9ee39463d19549826292ed020c21900e
---
M config.defaults.js
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/05/236005/1

diff --git a/config.defaults.js b/config.defaults.js
index 008c791..7d724a8 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -50,16 +50,17 @@
an: [ 'es' ],
ast: [ 'es' ],
bg: [ 'mk' ],
-   ca: [ 'en', 'es', 'oc', 'pt', 'simple' ],
+   ca: [ 'en', 'es', 'eo', 'fr', 'oc', 'pt', 
'simple' ],
cy: [ 'en', 'simple' ],
en: [ 'ca', 'eo', 'es', 'gl', 'sh' ],
eo: [ 'en', 'simple' ],
-   es: [ 'an', 'ast', 'ca', 'en', 'fr', 'gl', 
'oc', 'pt', 'simple' ],
+   es: [ 'an', 'ast', 'ca', 'en', 'eo', 'fr', 
'gl', 'oc', 'pt', 'simple' ],
eu: [ 'en', 'es', 'simple' ],
-   fr: [ 'es' ],
+   fr: [ 'ca', 'eo', 'es' ],
gl: [ 'en', 'es', 'simple' ],
hi: [ 'ur' ],
id: [ 'ms' ],
+   it: [ 'ca' ],
kk: [ 'tt' ],
mk: [ 'bg', 'sr' ],
ms: [ 'id' ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5f6ba9d9ee39463d19549826292ed020c21900e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Improves the range checking of tag - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

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

Change subject: Improves the range checking of  tag
..


Improves the range checking of  tag

More readable code

Bug: T111035
Change-Id: I84d746b74635e3aea85da33a268cec3c6342d64c
---
M includes/Parser/PagesTagParser.php
M tests/parser/proofreadpage_pages.txt
2 files changed, 24 insertions(+), 2 deletions(-)

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



diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index 1f5fd18..4fe4620 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -109,7 +109,7 @@
return $this->formatError( 
'proofreadpage_number_expected' );
}
 
-   if( ($from > $to) || ($from < 1) || 
($to < 1 ) || ($to > $count) ) {
+   if( !( 1 <= $from && $from <= $to && 
$to <= $count ) ) {
return $this->formatError( 
'proofreadpage_invalid_interval' );
}
 
@@ -132,7 +132,7 @@
}
 
ksort( $pagenums ); //we must sort the array 
even if the numerical keys are in a good order.
-   if( reset( $pagenums ) > $count ) {
+   if( end( $pagenums ) > $count ) {
return $this->formatError( 
'proofreadpage_invalid_interval' );
}
 
diff --git a/tests/parser/proofreadpage_pages.txt 
b/tests/parser/proofreadpage_pages.txt
index 2c2fcd8..0640e3e 100644
--- a/tests/parser/proofreadpage_pages.txt
+++ b/tests/parser/proofreadpage_pages.txt
@@ -262,6 +262,28 @@
 !! end
 
 !! test
+pages: with file: Invalid range
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Invalid include
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
 pages: with file: Simple transclusion without to
 !! options
 djvu

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84d746b74635e3aea85da33a268cec3c6342d64c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: GOIII 
Gerrit-Reviewer: Phe 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix variable capitalization - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Fix variable capitalization
..

Fix variable capitalization

Change-Id: I590e229f8a3362a271ad7055ecc9e62e0cf41a5a
---
M includes/Parsoid/Utils.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 182cf4e..247d21d 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -40,7 +40,6 @@
// If we have no parsoid config, fallback to the parser.
return self::parser( $from, $to, $content, $title );
}
-
}
 
/**
@@ -110,7 +109,7 @@
if ( $response['error'] !== '' ) {
$statusMsg = $response['error'];
} else {
-   $statusMSg = $response['code'];
+   $statusMsg = $response['code'];
}
$msg = "Failed contacting Parsoid for title 
\"$prefixedDbTitle\": $statusMsg";
wfDebugLog( 'Flow', __METHOD__ . ": $msg" );
@@ -198,7 +197,7 @@
 * For backwards compatibility, $wgFlowParsoid* variables are used
 * to specify a Parsoid configuration as a fall back.
 *
-* @return VirtualRESTService the VirtualRESTService object to use
+* @return \VirtualRESTService the VirtualRESTService object to use
 * @throws NoParsoidException When parsoid is unconfigured
 */
private static function getVRSObject() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I590e229f8a3362a271ad7055ecc9e62e0cf41a5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] EducationProgram: Add GENDER to some messages. - change (mediawiki...EducationProgram)

[jenkins-bot (Code Review)]

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

Change subject: EducationProgram: Add GENDER to some messages.
..


EducationProgram: Add GENDER to some messages.

See also:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Ep-disenroll-not-enrolled/pl
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Ep-enroll-add-token-doc/pl
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Ep-mycourses-not-enrolled/pl

Change-Id: I6cd347f254d9b10f679f0e291c0e7871a496aedc
---
M i18n/en.json
M includes/specials/SpecialDisenroll.php
2 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 4755712..68acdfd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -533,8 +533,8 @@
"ep-enroll-course-planned": "This course has not yet started, please be 
patient. See the [[Special:Courses|list of courses]].",
"ep-disenroll-no-name": "You need to provide the name of the course you 
want to disenroll from.",
"ep-disenroll-invalid-name": "There is no course with name \"$1\".",
-   "ep-disenroll-course-passed": "This course has ended. You can no longer 
disenroll from it.",
-   "ep-disenroll-not-enrolled": "You are not enrolled in this course, so 
cannot disenroll from it.",
+   "ep-disenroll-course-passed": "This course has ended. You {{GENDER:|can 
no longer disenroll}} from it.",
+   "ep-disenroll-not-enrolled": "You {{GENDER:|are not enrolled}} in this 
course, so cannot disenroll from it.",
"ep-disenroll-title": "Disenroll from course \"$1\"",
"ep-disenroll-text": "You are about to disenroll from course \"$1\". 
This will remove any articles you are working on for this course from your 
student profile.",
"ep-disenroll-button": "Disenroll",
@@ -543,19 +543,19 @@
"ep-disenroll-fail": "Something went wrong - could not disenroll you 
from this course.",
"ep-disenroll-success": "{{GENDER:$1|You}} have been successfully 
{{GENDER:$1|disenrolled}} from this course!",
"ep-disenroll-returntolink": "Return to [[Education_Program:$2|course 
$1]].",
-   "ep-mycourses-enrolled": "You have successfully enrolled for $1 at $2.",
-   "ep-mycourses-not-enrolled": "You are not enrolled in any course. See 
the [[Special:Courses|list of courses]].",
-   "ep-mycourses-no-such-course": "You are not enrolled in any course with 
name \"$1\". The courses you are enrolled in are listed below.",
-   "ep-mycourses-nocourses-epstudent": "You are not enrolled in any 
[[Special:Courses|courses]].",
+   "ep-mycourses-enrolled": "You {{GENDER:|have successfully enrolled}} 
for $1 at $2.",
+   "ep-mycourses-not-enrolled": "You {{GENDER:|are not enrolled}} in any 
course. See the [[Special:Courses|list of courses]].",
+   "ep-mycourses-no-such-course": "You {{GENDER:|are not enrolled}} in any 
course with the name \"$1\". The courses you are enrolled in are listed below.",
+   "ep-mycourses-nocourses-epstudent": "You {{GENDER:|are not enrolled}} 
in any [[Special:Courses|courses]].",
"ep-mycourses-login-first": "You need to login before you can view your 
courses.",
"ep-mycourses-courses-epoa": "{{PLURAL:$1|Course|Courses}} you are 
{{GENDER:$2|Online volunteer}} for",
"ep-mycourses-courses-epca": "{{PLURAL:$1|Course|Courses}} you are 
{{GENDER:$2|Campus volunteer}} for",
"ep-mycourses-courses-epinstructor": "{{PLURAL:$1|Course|Courses}} you 
are {{GENDER:$2|Instructor}} for",
-   "ep-mycourses-courses-epstudent": "{{PLURAL:$1|Course|Courses}} you are 
enrolled in",
+   "ep-mycourses-courses-epstudent": "{{PLURAL:$1|Course|Courses}} you 
{{GENDER:|are enrolled}} in",
"ep-mycourses-nocourses-epca": "There are no courses for which you are 
{{GENDER:$1|Campus volunteer}} yet.",
"ep-mycourses-nocourses-epoa": "There are no courses for which you are 
{{GENDER:$1|Online volunteer}} for yet.",
"ep-mycourses-nocourses-epinstructor": "There are no courses for which 
you are {{GENDER:$1|Instructor}} for yet.",
-   "ep-mycourses-enrolledin": "You are currently enrolled in course $1 at 
institution $2.",
+   "ep-mycourses-enrolledin": "You {{GENDER:|are currently enrolled}} in 
course $1 at institution $2.",
"ep-mycourses-course-org-links": "Course $1 at institution $2.",
"ep-mycourses-articletable": "These are the articles you are working on 
and their reviewers:",
"ep-instructor-remove-title": "Remove instructor from course",
diff --git a/includes/specials/SpecialDisenroll.php 
b/includes/specials/SpecialDisenroll.php
index 7fc963f..8e2f4ff 100644
--- a/includes/specials/SpecialDisenroll.php
+++ b/includes/specials/SpecialDisenroll.php
@@ -36,7 +36,7 @@
$courseName = str_replace( '_', ' ', $this->subPage );
 
   

[MediaWiki-commits] [Gerrit] [WIP] Show real output instead of placeholder HTML - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: [WIP] Show real output instead of placeholder HTML
..

[WIP] Show real output instead of placeholder HTML

This was removed in Id70d057a0ef5f4b8b59357f37d20f3ec1791ed4d
to simplify some code.
Turns out it shouldn't have been removed, since Special:Undelete
needs it to show the board after it has been deleted.
Special:Undelete?target=...=...

The patch where it was removed said it would avoid running into
consistency/permissions issues, which I have yet to test.

While the page renders & things like infinite scroll work, some
icons are misaligned, which also has to be fixed.

Bug: T110696
Change-Id: Ia8804d708351c8aa8f251de378a3f564d1d58956
---
M includes/Content/BoardContent.php
1 file changed, 21 insertions(+), 10 deletions(-)


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

diff --git a/includes/Content/BoardContent.php 
b/includes/Content/BoardContent.php
index 6699450..6409d57 100644
--- a/includes/Content/BoardContent.php
+++ b/includes/Content/BoardContent.php
@@ -174,17 +174,28 @@
$parserOutput->setTimestamp( $timestamp );
 
if ( $generateHtml ) {
-   $parserOutput->setText(
-   // Flow boards are rendered on view (in two 
possible
-   // orders) and can be thousands of topics long, 
so
-   // rendering a few topics into the parser 
output at
-   // parse-time may not be useful in practice.
-   Html::element(
-   'span',
-   array( 'class' => 
'flow-parser-output-placeholder' ),
-   'This is a placeholder in place of a 
Flow board.'
-   )
+   // Set up a derivative context (which inherits the 
current request)
+   // to hold the output modules + text
+   $childContext = new DerivativeContext( 
RequestContext::getMain() );
+   $childContext->setOutput( new OutputPage( $childContext 
) );
+   $childContext->setRequest( new FauxRequest );
+
+   // Create a View set up to output to our derivative 
context
+   $view = new View(
+   Container::get( 'url_generator' ),
+   Container::get( 'lightncandy' ),
+   $childContext->getOutput(),
+   Container::get( 'flow_actions' )
);
+
+   $loader = $this->getWorkflowLoader( $title );
+   $view->show( $loader, 'view' );
+
+   // Extract data from derivative context
+   $parserOutput->setText( 
$childContext->getOutput()->getHTML() );
+   $parserOutput->addModules( 
$childContext->getOutput()->getModules() );
+   $parserOutput->addModuleStyles( 
$childContext->getOutput()->getModuleStyles() );
+   $parserOutput->addModuleScripts( 
$childContext->getOutput()->getModuleScripts() );
}
 
/** @var LinksTableUpdater $updater */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8804d708351c8aa8f251de378a3f564d1d58956
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Check URIs in data values against vocabulary base URI. - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Check URIs in data values against vocabulary base URI.
..


Check URIs in data values against vocabulary base URI.

We use URIs as identifiers for calendars, reference globes, and units
of measurement. The vocabulary these URIs come from should be configurable.

Currently, calendars and globes are hardcoded to use Wikidata URIs,
while units use the local repo concepts as the vocabulary.

This change checks incoming data values against the appropriate URI
prefixes.

Bug: T71
Change-Id: Ib91b1c0a297fd9ab54b0dabf446eb8850e46ac0d
---
M repo/includes/ValidatorBuilders.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
3 files changed, 99 insertions(+), 26 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/ValidatorBuilders.php 
b/repo/includes/ValidatorBuilders.php
index 7475572..60d01ea 100644
--- a/repo/includes/ValidatorBuilders.php
+++ b/repo/includes/ValidatorBuilders.php
@@ -37,19 +37,35 @@
 class ValidatorBuilders {
 
/**
-* @var EntityIdParser
-*/
-   private $entityIdParser;
-
-   /**
 * @var EntityLookup
 */
private $entityLookup;
 
/**
+* @var EntityIdParser
+*/
+   private $entityIdParser;
+
+   /**
 * @var string[]
 */
private $urlSchemes;
+
+   /**
+* @var string The base URI for the vocabulary to use for units (and in 
the
+* future, globes and calendars).
+*/
+   private $vocabularyBaseUri;
+
+   /**
+* @var string The base URI wikibase concepts, for use with the 
validators for time and globe
+* values. Our parsers for these data types currently have Wikidata 
URIs hardcoded, so we need
+* to hardcode the URI to check them against for now.
+*
+* @todo: use a configurable vocabulary for calendars and reference 
globes, instead of
+* hardcoding wikidata. Then replace usages of $wikidataBaseUri with 
$vocabularyBaseUri.
+*/
+   private $wikidataBaseUri = 'http://www.wikidata.org/entity/';
 
/**
 *
@@ -62,17 +78,20 @@
 * @param EntityIdParser $idParser
 * @param string[] $urlSchemes
 * @param ContentLanguages $contentLanguages
+* @param string $vocabularyBaseUri The base URI for vocabulary 
concepts.
 */
public function __construct(
EntityLookup $lookup,
EntityIdParser $idParser,
array $urlSchemes,
+   $vocabularyBaseUri,
ContentLanguages $contentLanguages
) {
-   $this->contentLanguages = $contentLanguages;
-   $this->entityIdParser = $idParser;
$this->entityLookup = $lookup;
+   $this->entityIdParser = $idParser;
$this->urlSchemes = $urlSchemes;
+   $this->vocabularyBaseUri = $vocabularyBaseUri;
+   $this->contentLanguages = $contentLanguages;
}
 
/**
@@ -187,7 +206,7 @@
$validators[] = new TypeValidator( 'array' );
 
// Expected to be a short IRI, see TimeFormatter and TimeParser.
-   $urlValidator = $this->getUrlValidator( array( 'http', 'https' 
), 255 );
+   $urlValidator = $this->getUrlValidator( array( 'http', 'https' 
), $this->wikidataBaseUri, 255 );
//TODO: enforce well known calendar models from config
 
$validators[] = new DataFieldValidator( 'calendarmodel', 
$urlValidator );
@@ -235,7 +254,7 @@
$validators[] = new TypeValidator( 'array' );
 
// Expected to be a short IRI, see GlobeCoordinateValue and 
GlobeCoordinateParser.
-   $urlValidator = $this->getUrlValidator( array( 'http', 'https' 
), 255 );
+   $urlValidator = $this->getUrlValidator( array( 'http', 'https' 
), $this->wikidataBaseUri, 255 );
//TODO: enforce well known reference globes from config
 
$validators[] = new DataFieldValidator( 'precision', new 
NumberValidator() );
@@ -251,13 +270,14 @@
 
/**
 * @param string[] $urlSchemes List of URL schemes, e.g. 'http'
+* @param string|null $prefix a required prefix
 * @param int $maxLength Defaults to 500 characters. Even if URLs are 
unlimited in theory they
 * should be limited to about 2000. About 500 is a reasonable 
compromise.
 * @see http://stackoverflow.com/a/417184
 *
 * @return CompositeValidator
 */
-   private function getUrlValidator( $urlSchemes, $maxLength = 500 ) {
+   private function getUrlValidator( array $urlSchemes, $prefix = null, 
$maxLength = 

[MediaWiki-commits] [Gerrit] Fix syntax error - change (mediawiki...ParsoidBatchAPI)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: Fix syntax error
..

Fix syntax error

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParsoidBatchAPI 
refs/changes/21/236021/1

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 801f2a0..200ac32 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,5 @@
"Raimond Spekking"
]
},
-   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};,
+   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If953de631c1a3baf9dcf1e5d93a968cf548a2268
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Back out "Re-use example surface across surface view tests" - change (VisualEditor/VisualEditor)

[Divec (Code Review)]

Divec has uploaded a new change for review.

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

Change subject: Back out "Re-use example surface across surface view tests"
..

Back out "Re-use example surface across surface view tests"

Back out 14a0f114de0eb9916785cdb560159279ea8d0e42 , as it can cause unit test
failures that are difficult to debug (e.g. failure when all tests are run, but
success when the failed test is rerun).

Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/23/236023/1

diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 5111d01..977fced 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -8,8 +8,6 @@
 
 /* Tests */
 
-ve.test.utils.exampleSurface = ve.test.utils.createSurfaceViewFromDocument( 
ve.dm.example.createExampleDocument() );
-
 ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, html, range, 
operations, expectedData, expectedSelection, msg ) {
var i, method, args, selection,
actions = {
@@ -22,7 +20,7 @@
},
view = html ?
ve.test.utils.createSurfaceViewFromHtml( html ) :
-   ve.test.utils.exampleSurface,
+   ve.test.utils.createSurfaceViewFromDocument( 
ve.dm.example.createExampleDocument() ),
model = view.getModel(),
data = ve.copy( model.getDocument().getFullData() );
 
@@ -44,13 +42,7 @@
 
assert.equalLinearData( model.getDocument().getFullData(), data, msg + 
': data' );
assert.deepEqual( selection.toJSON(), expectedSelection, msg + ': 
selection' );
-   if ( view === ve.test.utils.exampleSurface ) {
-   while ( model.hasBeenModified() ) {
-   model.undo();
-   }
-   } else {
-   view.destroy();
-   }
+   view.destroy();
 };
 
 QUnit.test( 'handleLinearDelete', function ( assert ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 

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

[MediaWiki-commits] [Gerrit] Add zuul-cloner map for parsoidsvc jobs - change (integration/jenkins)

[jenkins-bot (Code Review)]

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

Change subject: Add zuul-cloner map for parsoidsvc jobs
..


Add zuul-cloner map for parsoidsvc jobs

Bug: T111469
Change-Id: Ida89f44dde9668edca3af48cfdcd308b3de46df0
---
A etc/zuul-parsoid-clonemap.yaml
1 file changed, 22 insertions(+), 0 deletions(-)

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



diff --git a/etc/zuul-parsoid-clonemap.yaml b/etc/zuul-parsoid-clonemap.yaml
new file mode 100644
index 000..a4b85b6
--- /dev/null
+++ b/etc/zuul-parsoid-clonemap.yaml
@@ -0,0 +1,22 @@
+# Clone map for Zuul cloner in Parsoid jobs
+#
+# Canonical repository in integration/jenkins.git
+# Please add tests to /tests/test_zuul_clonemap_config.py
+#
+clonemap:
+
+ # Parsoid plus MediaWiki core
+ #
+ #  workspace/
+ #  ├── parsoidsvc/
+ #  └── src/
+ #  └── mediawiki/
+ #  └── core/
+
+ # MediaWiki to src/mediawiki/core/
+ - name: 'mediawiki/core'
+   dest: './src/mediawiki/core'
+
+ # Parsoid to parsoidsvc
+ - name: 'mediawiki/services/parsoid'
+   dest: './parsoidsvc'

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

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

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

[MediaWiki-commits] [Gerrit] wmnet: indentation fixes - change (operations/dns)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: wmnet: indentation fixes
..


wmnet: indentation fixes

Change-Id: If42ca075f518420e08bc8e2eb202df0b6ac65992
---
M templates/wmnet
1 file changed, 96 insertions(+), 96 deletions(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 6866685..a781310 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -117,46 +117,46 @@
 analytics1021   1H  IN A 10.64.5.14
 1H  IN   2620:0:861:104:10:64:5:14
 
-analytics10261H IN A 10.64.36.126
-analytics10271H IN A 10.64.36.127
-analytics10281H IN A 10.64.36.128
-analytics10291H IN A 10.64.36.129
-analytics10301H IN A 10.64.36.130
-analytics10311H IN A 10.64.36.131
-analytics10321H IN A 10.64.36.132
-analytics10331H IN A 10.64.36.133
-analytics10341H IN A 10.64.36.134
-analytics10351H IN A 10.64.53.14
-analytics10361H IN A 10.64.53.15
-analytics10371H IN A 10.64.53.16
-analytics10381H IN A 10.64.53.17
-analytics10391H IN A 10.64.53.18
-analytics10401H IN A 10.64.53.19
-analytics10411H IN A 10.64.53.20
-analytics10421H IN A 10.64.53.22
-analytics10431H IN A 10.64.53.23
-analytics10441H IN A 10.64.53.24
-analytics10451H IN A 10.64.53.25
-analytics10461H IN A 10.64.21.105
-analytics10471H IN A 10.64.21.106
-analytics10481H IN A 10.64.21.107
-analytics10491H IN A 10.64.21.108
-analytics10501H IN A 10.64.21.111
-analytics10511H IN A 10.64.21.112
-analytics10521H IN A 10.64.5.15
-analytics10531H IN A 10.64.5.16
-analytics10541H IN A 10.64.5.17
-analytics10551H IN A 10.64.5.18
-analytics10561H IN A 10.64.5.19
-analytics10571H IN A 10.64.5.20
-berkelium1H IN A 10.64.0.169
- 1H IN  2620:0:861:101:10:64:0:169
-caesium  1H IN A 10.64.32.145
-cerium   1H IN A 10.64.16.147
-copper   1H IN A 10.64.16.176
-conf1001 1H IN A 10.64.0.18
-conf1002 1H IN A 10.64.32.180
-conf1003 1H IN A 10.64.48.111
+analytics10261H IN A 10.64.36.126
+analytics10271H IN A 10.64.36.127
+analytics10281H IN A 10.64.36.128
+analytics10291H IN A 10.64.36.129
+analytics10301H IN A 10.64.36.130
+analytics10311H IN A 10.64.36.131
+analytics10321H IN A 10.64.36.132
+analytics10331H IN A 10.64.36.133
+analytics10341H IN A 10.64.36.134
+analytics10351H IN A 10.64.53.14
+analytics10361H IN A 10.64.53.15
+analytics10371H IN A 10.64.53.16
+analytics10381H IN A 10.64.53.17
+analytics10391H IN A 10.64.53.18
+analytics10401H IN A 10.64.53.19
+analytics10411H IN A 10.64.53.20
+analytics10421H IN A 10.64.53.22
+analytics10431H IN A 10.64.53.23
+analytics10441H IN A 10.64.53.24
+analytics10451H IN A 10.64.53.25
+analytics10461H IN A 10.64.21.105
+analytics10471H IN A 10.64.21.106
+analytics10481H IN A 10.64.21.107
+analytics10491H IN A 10.64.21.108
+analytics10501H IN A 10.64.21.111
+analytics10511H IN A 10.64.21.112
+analytics10521H IN A 10.64.5.15
+analytics10531H IN A 10.64.5.16
+analytics10541H IN A 10.64.5.17
+analytics10551H IN A 10.64.5.18
+analytics10561H IN A 10.64.5.19
+analytics10571H IN A 10.64.5.20
+berkelium1H IN A 10.64.0.169
+ 1H IN  2620:0:861:101:10:64:0:169
+caesium  1H IN A 10.64.32.145
+cerium   1H IN A 10.64.16.147
+copper

[MediaWiki-commits] [Gerrit] Fix Parsoid conversion when using ParsoidVirtualRESTService - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Fix Parsoid conversion when using ParsoidVirtualRESTService
..

Fix Parsoid conversion when using ParsoidVirtualRESTService

I was getting failures because Utils::parsoid returned a full html
document instead of just the body. Turns out ParsoidVirtualRESTService
doesn't recognize or respond to 'bodyOnly'.
Luckily, it has a param 'body' & RestbaseVirtualRESTService also
recognizes that one and transforms to 'bodyOnly', AFAICT.

Unfortunately, according to https://www.mediawiki.org/wiki/Parsoid/API,
both respond slightly differently: Parsoid includes  node while
Restbase doesn't.
That doesn't really matter much - we're able to understand both of those
already, but it seems nicer to standardize on 1, regardless of the service.

Change-Id: I9f2b64b039c3aa5e57207b03d5269d3abb82efe3
---
M includes/Parsoid/Utils.php
1 file changed, 18 insertions(+), 1 deletion(-)


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

diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 247d21d..44a92ee 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -92,7 +92,10 @@
$prefixedDbTitle = $title->getPrefixedDBkey();
$params = array(
$from => $content,
-   'bodyOnly' => 'true',
+   // ParsoidVirtualRESTService only supports 'body' 
(returns 
+   // node) & RestbaseVirtualRESTService also understands 
'body'
+   // (which it converts to 'bodyOnly' (returns  
children))
+   'body' => 'true',
);
if ( $from === 'html' ) {
$params['scrubWikitext'] = 'true';
@@ -121,6 +124,20 @@
if ( $to === 'wikitext' ) {
$content = preg_replace( '/\\n$/', '', $content );
}
+
+   // ParsoidVirtualRESTService & RestbaseVirtualRESTService 
response
+   // when param 'body' is set is slightly different: the former 
includes
+   // the  tag while the latter only returns the children.
+   // Let's omit  tag everywhere to standardize our content.
+   $dom = static::createDOM( $content );
+   $body = $dom->getElementsByTagName( 'body' )->item( 0 );
+   if ( $body !== null ) {
+   $content = '';
+   foreach ( $body->childNodes as $childNode ) {
+   $content .= $dom->saveHTML( $childNode );
+   }
+   }
+
return $content;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f2b64b039c3aa5e57207b03d5269d3abb82efe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] [Parsoid Batch API] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Parsoid Batch API] Register extension
..

[Parsoid Batch API] Register extension

Change-Id: I6e2b29a5fa3d070448dac4c4e1d09bd9c6bff30e
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/18/236018/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index afa93e7..70dad9e 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1713,6 +1713,8 @@
 # Deleted 2015-08-02
 # Parsoid
 
+Parsoid Batch API
+
 Pdf Book
 
 Pdf Export

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e2b29a5fa3d070448dac4c4e1d09bd9c6bff30e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [ParsoidBatchAPI] Already enabled on all WMF wikis - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [ParsoidBatchAPI] Already enabled on all WMF wikis
..


[ParsoidBatchAPI] Already enabled on all WMF wikis

Change-Id: Ie7209b61bc9d5cac12fb2becb44fdaa3b3380abc
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index a152191..4e8355c 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -77,6 +77,7 @@
   - ext-openstackmanager # 2011-12-28: labsconsole.wikimedia.org
   - ext-pageimages
   - ext-parsoid # All wikis
+  - ext-parsoidbatchapi # All wikis
   - ext-petition # 2014-04-22: Foundationwiki
   - ext-poem
   - ext-popups # 2014-03-19

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7209b61bc9d5cac12fb2becb44fdaa3b3380abc
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [ParsoidBatchAPI] Already enabled on all WMF wikis - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [ParsoidBatchAPI] Already enabled on all WMF wikis
..

[ParsoidBatchAPI] Already enabled on all WMF wikis

Change-Id: Ie7209b61bc9d5cac12fb2becb44fdaa3b3380abc
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/17/236017/1

diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index a152191..4e8355c 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -77,6 +77,7 @@
   - ext-openstackmanager # 2011-12-28: labsconsole.wikimedia.org
   - ext-pageimages
   - ext-parsoid # All wikis
+  - ext-parsoidbatchapi # All wikis
   - ext-petition # 2014-04-22: Foundationwiki
   - ext-poem
   - ext-popups # 2014-03-19

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7209b61bc9d5cac12fb2becb44fdaa3b3380abc
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] WIP Fix language screenshot Jenkins job - change (integration/config)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: WIP Fix language screenshot Jenkins job
..

WIP Fix language screenshot Jenkins job

Bug: T111510
Change-Id: I2916c17b81ae2dd34a5d82e11e650dd119c6aa9b
---
M jjb/macro-browsertests.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/19/236019/1

diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 5cacf6e..19440ff 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -105,6 +105,7 @@
 CUCUMBER_PARAMETER="@language_screenshot"
 export LANGUAGE_SCREENSHOT_PATH="$WORKSPACE/log"
 export LANGUAGE_SCREENSHOT_CATEGORY="{name} automatic screenshots"
+export MEDIAWIKI_USER=LanguageScreenshotBot
   elif [[ $JOB_NAME == browsertests-Core-* ]]; then
 CUCUMBER_PARAMETER="@clean"
   elif [[ ! -z $CUCUMBER_TAGS ]]; then

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

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

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

[MediaWiki-commits] [Gerrit] Restrict Hadoop access to the analytics network - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Restrict Hadoop access to the analytics network
..


Restrict Hadoop access to the analytics network

Due to a bug in Hadoop is uses unrepredictable dynamic ports although
configured not to do so, see T111433. Until that is fixed we only
restrict access to the analytics network.

Change-Id: Iddc3c02a0cd3026508fe49bc76588820e5a3d9d5
---
M manifests/role/analytics/hadoop.pp
1 file changed, 3 insertions(+), 77 deletions(-)

Approvals:
  Ottomata: Looks good to me, but someone else must approve
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 92d5e19..5c5ab72 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -619,84 +619,10 @@
 }
 }
 
-# Open up port for debugging
-ferm::service{ 'jmxtrans-jmx':
+# T111433
+ferm::service{ 'hadoop-access':
 proto  => 'tcp',
-port   => '2101',
-srange => '$INTERNAL',
-}
-
-ferm::service{ 'hadoop-hdfs-journalnode-jmx':
-proto  => 'tcp',
-port   => '9981',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-jmx':
-proto  => 'tcp',
-port   => '9984',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager':
-proto  => 'tcp',
-port   => '8041',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-localizer':
-proto  => 'tcp',
-port   => '8040',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-http-ui':
-proto  => 'tcp',
-port   => '8042',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-mapreduce-application-master':
-proto  => 'tcp',
-# $yarn_app_mapreduce_am_job_client_port_range could look like 
'55000-55199,55500-55599'.
-# Translate '-' -> ':' and ',' => ' ' for ferm, e.g. (55000:55199 
55500:55599)
-port   => inline_template('(<%= 
@yarn_app_mapreduce_am_job_client_port_range.tr("-,", ": ") %>)'),
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-ha-journalnode-http':
-proto  => 'tcp',
-port   => '8480',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-ha-journalnode':
-proto  => 'tcp',
-port   => '8485',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-mapreduce-shuffle':
-proto  => 'tcp',
-port   => '13562',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-http-ui':
-proto  => 'tcp',
-port   => '50075',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-ipc':
-proto  => 'tcp',
-port   => '50020',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-dfs-transfer':
-proto  => 'tcp',
-port   => '50010',
+port   => '1024:65535',
 srange => '$ANALYTICS_NETWORKS',
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddc3c02a0cd3026508fe49bc76588820e5a3d9d5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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] apertium: Add new language pairs - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: apertium: Add new language pairs
..


apertium: Add new language pairs

* apertium-ca-it
* apertium-eo-ca
* apertium-eo-es
* apertium-eo-fr
* apertium-fr-ca

Change-Id: I3317d9fb3cd4e7ceefea29678a083a6acbd3cdbd
---
M modules/apertium/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/apertium/manifests/init.pp 
b/modules/apertium/manifests/init.pp
index 88b6a5c..5897b8a 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -26,13 +26,17 @@
 'apertium',
 'apertium-af-nl',
 'apertium-apy',
+'apertium-ca-it',
 'apertium-cy-en',
 'apertium-dan',
 'apertium-dan-nor',
 'apertium-en-ca',
 'apertium-en-es',
 'apertium-en-gl',
+'apertium-eo-ca',
 'apertium-eo-en',
+'apertium-eo-es',
+'apertium-eo-fr',
 'apertium-es-an',
 'apertium-es-ast',
 'apertium-es-ca',
@@ -41,6 +45,7 @@
 'apertium-eu-en',
 'apertium-eu-es',
 'apertium-eus',
+'apertium-fr-ca',
 'apertium-fr-es',
 'apertium-hbs',
 'apertium-hin',

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

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

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

[MediaWiki-commits] [Gerrit] [Parsoid Batch API] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Parsoid Batch API] Register extension
..


[Parsoid Batch API] Register extension

Change-Id: I6e2b29a5fa3d070448dac4c4e1d09bd9c6bff30e
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index afa93e7..70dad9e 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1713,6 +1713,8 @@
 # Deleted 2015-08-02
 # Parsoid
 
+Parsoid Batch API
+
 Pdf Book
 
 Pdf Export

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e2b29a5fa3d070448dac4c4e1d09bd9c6bff30e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Consider the object reference not being passed in the expect... - change (mediawiki...UploadWizard)

[Kai Nissen (WMDE) (Code Review)]

Kai Nissen (WMDE) has uploaded a new change for review.

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

Change subject: Consider the object reference not being passed in the expected 
format
..

Consider the object reference not being passed in the expected format

This fix cares for the parameter objref not containing the expected pipe
character as the delimiter. The href of the button that is configured to
'useObjref' will only be applied if the objref parameter consists of at
least two values delimited by the pipe character.

Bug: T111381
Change-Id: I1e422f135aad29d569b81a867da9a393c974f31e
---
M includes/UploadWizardCampaign.php
M tests/phpunit/UploadWizardConfigTest.php
2 files changed, 46 insertions(+), 13 deletions(-)


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

diff --git a/includes/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index cdd7938..872401a 100755
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -444,9 +444,12 @@
 * @return bool|string
 */
private function getButtonHrefByObjectReference( $objRef ) {
-   list( $wiki, $title ) = explode( '|', $objRef );
-   if ( Interwiki::isValidInterwiki( $wiki ) ) {
-   return str_replace( '$1', $title, Interwiki::fetch( 
$wiki )->getURL() );
+   $arrObjRef = explode( '|', $objRef );
+   if ( count( $arrObjRef ) > 1 ) {
+   list( $wiki, $title ) = $arrObjRef;
+   if ( Interwiki::isValidInterwiki( $wiki ) ) {
+   return str_replace( '$1', $title, 
Interwiki::fetch( $wiki )->getURL() );
+   }
}
return false;
}
diff --git a/tests/phpunit/UploadWizardConfigTest.php 
b/tests/phpunit/UploadWizardConfigTest.php
index c511606..e59ddc5 100644
--- a/tests/phpunit/UploadWizardConfigTest.php
+++ b/tests/phpunit/UploadWizardConfigTest.php
@@ -7,18 +7,52 @@
 
 class UploadWizardConfigTest extends MediaWikiTestCase {
 
-   public function 
testButtonTargetIsSetToUseObjRef_buttonHrefMatchesRefPage() {
+   public function objRefProvider() {
+   return array(
+   array(
+   '',
+   false
+   ),
+   array(
+   'JustSomeString',
+   false
+   ),
+   array(
+   'notawiki|Page Title',
+   false
+   ),
+   array(
+   'es|Page Title',
+   'http://es.wikipedia.org/wiki/Page Title'
+   ),
+   array(
+   'es|Page Title|id12345',
+   'http://es.wikipedia.org/wiki/Page Title'
+   ),
+   );
+   }
+
+   /**
+* @dataProvider objRefProvider
+*/
+   public function 
testButtonTargetIsSetToUseObjRef_buttonHrefMatchesRefPage( $objRef, 
$expectedResult ) {
global $wgUploadWizardConfig;
ParserTest::setupInterwikis();
 
$this->setMwGlobals( array(
'wgUploadWizardConfig' => array_merge( 
$wgUploadWizardConfig, array(
-   'defaults' => array( 'objref' => 'es|My 
Monuments|12345' ),
+   'defaults' => array( 'objref' => $objRef ),
) ),
) );
 
-   $campaign = new UploadWizardCampaign(
-   Title::newFromText( 'uw-test-campaign', NS_CAMPAIGN ),
+   $this->assertEquals(
+   $expectedResult,
+   $this->getHomeButtonHref()
+   );
+   }
+
+   private function getHomeButtonHref() {
+   $campaign = new UploadWizardCampaign( Title::newFromText( 
'uw-test-campaign', NS_CAMPAIGN ),
array(
'enabled' => true,
'display' => array(
@@ -29,12 +63,8 @@
)
)
);
+
$config = $campaign->getParsedConfig();
-
-   $this->assertEquals(
-   'http://es.wikipedia.org/wiki/My Monuments',
-   $config['display']['homeButton']['target']
-   );
+   return isset( $config['display']['homeButton']['target'] ) ? 
$config['display']['homeButton']['target'] : false;
}
-
 }

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

[MediaWiki-commits] [Gerrit] Refactroring of formatter factorie. - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Refactroring of formatter factorie.
..

Refactroring of formatter factorie.

This is in preparation of migrating ValueFormatter registration to
DataTypeDefinitions.

WikibaseSnakFormatterBuilders got merged into OutputFormatSnakFormatterFactory.
Part of WikibaseValueFormatterBuilders got moved into 
OutputFormatValueFormatterFactory.

Bug: T110213
Change-Id: I7d2ea14b0ab786bdb3e21f239a83f5e5efce90da
---
M client/includes/WikibaseClient.php
M lib/includes/formatters/DispatchingValueFormatter.php
M lib/includes/formatters/OutputFormatSnakFormatterFactory.php
M lib/includes/formatters/OutputFormatValueFormatterFactory.php
D lib/includes/formatters/WikibaseSnakFormatterBuilders.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
M lib/tests/phpunit/formatters/OutputFormatValueFormatterFactoryTest.php
D lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
M repo/includes/WikibaseRepo.php
11 files changed, 1,125 insertions(+), 1,393 deletions(-)


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

diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 77aa2b7..f9fcfb9 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -56,7 +56,6 @@
 use Wikibase\Lib\PropertyInfoDataTypeLookup;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\WikibaseContentLanguages;
-use Wikibase\Lib\WikibaseSnakFormatterBuilders;
 use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\NamespaceChecker;
 use Wikibase\SettingsArray;
@@ -519,15 +518,13 @@
 * @return OutputFormatSnakFormatterFactory
 */
private function newSnakFormatterFactory() {
-   $valueFormatterBuilders = 
$this->newWikibaseValueFormatterBuilders();
-
-   $builders = new WikibaseSnakFormatterBuilders(
-   $valueFormatterBuilders,
+   $factory = new OutputFormatSnakFormatterFactory(
+   $this->getValueFormatterFactory(),
$this->getPropertyDataTypeLookup(),
$this->getDataTypeFactory()
);
 
-   return new OutputFormatSnakFormatterFactory( 
$builders->getSnakFormatterBuildersForFormats() );
+   return $factory;
}
 
/**
@@ -549,7 +546,10 @@
 */
private function newValueFormatterFactory() {
$builders = $this->newWikibaseValueFormatterBuilders();
-   return new OutputFormatValueFormatterFactory( 
$builders->getValueFormatterBuildersForFormats() );
+   return new OutputFormatValueFormatterFactory(
+   $builders->getFormatterFactoryCallbacksByDataType(),
+   $this->getContentLanguage()
+   );
}
 
private function newWikibaseValueFormatterBuilders() {
diff --git a/lib/includes/formatters/DispatchingValueFormatter.php 
b/lib/includes/formatters/DispatchingValueFormatter.php
index 38ced97..b55349f 100644
--- a/lib/includes/formatters/DispatchingValueFormatter.php
+++ b/lib/includes/formatters/DispatchingValueFormatter.php
@@ -13,6 +13,9 @@
  * DispatchingValueFormatter is a formatter for DataValues. In addition to 
dispatching based on
  * the DataValue type, it also supports dispatching based on a DataType.
  *
+ * @todo: drop ValueFormatterBase ancestry. Plain format() shouldn't be 
supported,
+ * formatValue() should require the dataType ID.
+ *
  * @license GPL 2+
  * @author Daniel Kinzler
  */
@@ -78,6 +81,7 @@
 * @see ValueFormatter::format
 *
 * @since 0.5
+* @deprecated, use formatValue() instead
 *
 * @param DataValue $value The value to format
 *
diff --git a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php 
b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
index e62ccae..0ed657e 100644
--- a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
+++ b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
@@ -2,13 +2,16 @@
 
 namespace Wikibase\Lib;
 
+use DataTypes\DataTypeFactory;
 use InvalidArgumentException;
+use Message;
 use RuntimeException;
 use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 
 /**
- * OutputFormatSnakFormatterFactory is a service
- * for obtaining a SnakFormatter for a desired output format.
+ * Service for obtaining a SnakFormatter for a desired output format.
  *
  * @license GPL 2+
  * @author Daniel Kinzler
@@ -16,33 +19,37 @@
 class 

[MediaWiki-commits] [Gerrit] Fix variable capitalization - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Fix variable capitalization
..


Fix variable capitalization

Change-Id: I590e229f8a3362a271ad7055ecc9e62e0cf41a5a
---
M includes/Parsoid/Utils.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 182cf4e..247d21d 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -40,7 +40,6 @@
// If we have no parsoid config, fallback to the parser.
return self::parser( $from, $to, $content, $title );
}
-
}
 
/**
@@ -110,7 +109,7 @@
if ( $response['error'] !== '' ) {
$statusMsg = $response['error'];
} else {
-   $statusMSg = $response['code'];
+   $statusMsg = $response['code'];
}
$msg = "Failed contacting Parsoid for title 
\"$prefixedDbTitle\": $statusMsg";
wfDebugLog( 'Flow', __METHOD__ . ": $msg" );
@@ -198,7 +197,7 @@
 * For backwards compatibility, $wgFlowParsoid* variables are used
 * to specify a Parsoid configuration as a fall back.
 *
-* @return VirtualRESTService the VirtualRESTService object to use
+* @return \VirtualRESTService the VirtualRESTService object to use
 * @throws NoParsoidException When parsoid is unconfigured
 */
private static function getVRSObject() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I590e229f8a3362a271ad7055ecc9e62e0cf41a5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Modification of Comment in LocalSettings.php file - change (mediawiki/core)

[Haritha28 (Code Review)]

Haritha28 has uploaded a new change for review.

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

Change subject:   Modification of  Comment in LocalSettings.php file
..

Modification of  Comment in LocalSettings.php file

  The comment message given in enabling the extensions
  are based on for the earlier versions of mediawiki which
  uses the requireonce() and as at present all the versions
  since 1.25 uses wfLoadExtensions() the comment message
  have been changed accordingly.

  Bug:T100940

Change-Id: I915a4893cc2d89624c9d8dd6504d7dc8bf166cd9
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/236020/1

diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index 7b1cfdc..1115e00 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -153,7 +153,7 @@
 
if ( count( $this->extensions ) ) {
$localSettings .= "
-# Enabled Extensions. Most extensions are enabled by including the base 
extension file here
+# Enabled Extensions.The extensions can be enabled by adding the 
wfLoadExtensions('extensionname') command to the LocalSettings.php file
 # but check specific extension documentation for more details
 # The following extensions were automatically enabled:\n";
 

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

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

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

[MediaWiki-commits] [Gerrit] Use base::firewall on analytics1015 - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Use base::firewall on analytics1015
..


Use base::firewall on analytics1015

Change-Id: Ic004836e21c0f1134b17a684786e0450cf836d81
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ottomata: Looks good to me, but someone else must approve
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 9424680..683d55c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -115,6 +115,7 @@
 # This node is being repurposed - otto 2015-09
 node 'analytics1015.eqiad.wmnet' {
 include standard
+include base::firewall
 }
 
 # analytics1011, analytics1016-analytics1017, analytics1019,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic004836e21c0f1134b17a684786e0450cf836d81
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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] Restrict access to analytics network for Hadoop master/standby - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Restrict access to analytics network for Hadoop master/standby
..


Restrict access to analytics network for Hadoop master/standby

Change-Id: I76239efcb36b3982df55ff0d25a63068c8d9def2
---
M manifests/role/analytics/hadoop.pp
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Looks good to me, but someone else must approve
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 5c5ab72..100390a 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -510,6 +510,12 @@
 require => Class['cdh::hadoop::master'],
 }
 
+# T111433
+ferm::service{ 'hadoop-access':
+proto  => 'tcp',
+port   => '1024:65535',
+srange => '$ANALYTICS_NETWORKS',
+}
 
 # Include icinga alerts if production realm.
 if $::realm == 'production' {
@@ -684,6 +690,13 @@
 }
 }
 
+# T111433
+ferm::service{ 'hadoop-access':
+proto  => 'tcp',
+port   => '1024:65535',
+srange => '$ANALYTICS_NETWORKS',
+}
+
 # Open up port for debugging
 ferm::service{ 'jmxtrans-jmx':
 proto  => 'tcp',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76239efcb36b3982df55ff0d25a63068c8d9def2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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] Introduce Family class hierarchy - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: Introduce Family class hierarchy
..


Introduce Family class hierarchy

Introduce Family.codes and Family.domains as replacements
for accessing .langs.

SingleSiteFamily is a new Family subclass that automatically
creates the langs attribute using attributes `name` and domain
with an optional attribute `code`.

SubdomainFamily is new Family subclass that automatically
creates the langs attribute (and codes) using domain names.

Change-Id: If5d5697f42929bd818c76251ea3042a2cd781f92
---
M pywikibot/families/anarchopedia_family.py
M pywikibot/families/battlestarwiki_family.py
M pywikibot/families/commons_family.py
M pywikibot/families/i18n_family.py
M pywikibot/families/incubator_family.py
M pywikibot/families/lyricwiki_family.py
M pywikibot/families/mediawiki_family.py
M pywikibot/families/meta_family.py
M pywikibot/families/omegawiki_family.py
M pywikibot/families/osm_family.py
M pywikibot/families/outreach_family.py
M pywikibot/families/species_family.py
M pywikibot/families/strategy_family.py
M pywikibot/families/test_family.py
M pywikibot/families/vikidia_family.py
M pywikibot/families/wikia_family.py
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikidata_family.py
M pywikibot/families/wikimediachapter_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikitech_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/families/wowwiki_family.py
M pywikibot/family.py
M tests/family_tests.py
M tests/site_tests.py
31 files changed, 260 insertions(+), 203 deletions(-)

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



diff --git a/pywikibot/families/anarchopedia_family.py 
b/pywikibot/families/anarchopedia_family.py
index f67914d..22cf4ad 100644
--- a/pywikibot/families/anarchopedia_family.py
+++ b/pywikibot/families/anarchopedia_family.py
@@ -9,9 +9,12 @@
 
 
 # The Anarchopedia family
-class Family(family.Family):
+class Family(family.SubdomainFamily):
 
 """Family class for Anarchopedia wiki."""
+
+name = 'anarchopedia'
+domain = 'anarchopedia.org'
 
 interwiki_replacements = {
 # ISO 639-2 -> ISO 639-1 mappings
@@ -60,16 +63,13 @@
 
 def __init__(self):
 """Constructor."""
-family.Family.__init__(self)
-self.name = 'anarchopedia'
-
 self.languages_by_size = [
 'ar', 'en', 'de', 'nl', 'el', 'it', 'fa', 'fi', 'fr', 'he', 'es',
 'hy', 'id', 'meta', 'ja', 'ko', 'lv', 'lt', 'no', 'hr', 'pl', 'pt',
 'ro', 'ru', 'hrv', 'sq', 'sr', 'sv', 'tr', 'zh', 'eo', 'da',
 ]
-for l in self.languages_by_size:
-self.langs[l] = '%s.anarchopedia.org' % l
+
+super(Family, self).__init__()
 
 self.nocapitalize = list(self.langs.keys())
 
diff --git a/pywikibot/families/battlestarwiki_family.py 
b/pywikibot/families/battlestarwiki_family.py
index 549c085..a7817cc 100644
--- a/pywikibot/families/battlestarwiki_family.py
+++ b/pywikibot/families/battlestarwiki_family.py
@@ -8,16 +8,13 @@
 
 
 # The Battlestar Wiki family, a set of Battlestar wikis.
-# http://battlestarwiki.org/
-class Family(family.Family):
+class Family(family.SubdomainFamily):
 
 """Family class for Battlestar Wiki."""
 
 name = 'battlestarwiki'
+domain = 'battlestarwiki.org'
 
-languages_by_size = ['en', 'de']
+codes = ['en', 'de']
 
 interwiki_removals = ['fr', 'zh', 'es', 'ms', 'tr', 'simple']
-
-langs = dict([(lang, '%s.battlestarwiki.org' % lang)
-  for lang in languages_by_size])
diff --git a/pywikibot/families/commons_family.py 
b/pywikibot/families/commons_family.py
index e4d8520..d2edb13 100644
--- a/pywikibot/families/commons_family.py
+++ b/pywikibot/families/commons_family.py
@@ -8,17 +8,15 @@
 
 
 # The Wikimedia Commons family
-class Family(family.WikimediaFamily):
+class Family(family.WikimediaOrgFamily):
 
 """Family class for Wikimedia Commons."""
+
+name = 'commons'
 
 def __init__(self):
 """Constructor."""
 super(Family, self).__init__()
-self.name = 'commons'
-self.langs = {
-'commons': 'commons.wikimedia.org',
-}
 
 self.interwiki_forward = 'wikipedia'
 
diff --git a/pywikibot/families/i18n_family.py 
b/pywikibot/families/i18n_family.py
index dc75d8d..69ba58c 100644
--- a/pywikibot/families/i18n_family.py
+++ b/pywikibot/families/i18n_family.py
@@ -8,12 +8,12 @@
 
 
 # The Wikimedia i18n family
-class Family(family.Family):
+class Family(family.SingleSiteFamily):
 
 """Family class for Translate Wiki."""
 
 name = 'i18n'
-langs = {'i18n': 'translatewiki.net'}
+

[MediaWiki-commits] [Gerrit] Add comment line. - change (mediawiki...examples)

[Aybuke (Code Review)]

Aybuke has uploaded a new change for review.

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

Change subject: Add comment line.
..

Add comment line.

Change-Id: I0564a2149d6605a9a2b23261129c8ee1bbee9a42
---
M Example/Example.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples 
refs/changes/22/236022/1

diff --git a/Example/Example.php b/Example/Example.php
index 8dd18f8..b20a92a 100644
--- a/Example/Example.php
+++ b/Example/Example.php
@@ -63,6 +63,7 @@
'descriptionmsg' => 'example-desc',
 );
 
+//for diff
 /* Setup */
 
 // Initialize an easy to use shortcut:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0564a2149d6605a9a2b23261129c8ee1bbee9a42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Aybuke 

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

[MediaWiki-commits] [Gerrit] admin: add a group for apertium admins - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: admin: add a group for apertium admins
..


admin: add a group for apertium admins

Add a group for apertium admins who can run
all commands to control the service "apertium-apy" and
run everything as the user "apertium".

Does not add people to that group in this step.

Bug:T111360
Change-Id: I125364b57bc9aa9a7b43dcb5cd2586a1c0939265
---
M modules/admin/data/data.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7f11136..f72fcc8 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -377,6 +377,12 @@
 gid: 760
 description: users who can login on fluorine and read mediawiki logs
 members: [tjones]
+  apertium-admins:
+description: Group of apertium admins
+gid: 761
+members: []
+privileges: ['ALL = NOPASSWD: /usr/sbin/service apertium-apy *',
+ 'ALL = (apertium) NOPASSWD: ALL']
 users:
   rush:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I125364b57bc9aa9a7b43dcb5cd2586a1c0939265
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: KartikMistry 
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] Fix syntax error - change (mediawiki...ParsoidBatchAPI)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: Fix syntax error
..


Fix syntax error

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

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/i18n/qqq.json b/i18n/qqq.json
index 801f2a0..200ac32 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,5 @@
"Raimond Spekking"
]
},
-   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};,
+   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If953de631c1a3baf9dcf1e5d93a968cf548a2268
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Collect missing Navigation Timing metrics - change (operations/puppet)

[Phedenskog (Code Review)]

Phedenskog has uploaded a new change for review.

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

Change subject: Collect missing Navigation Timing metrics
..

Collect missing Navigation Timing metrics

Added missing nav timing metrics: unloadEventStart, unloadEventEnd
redirectStart, redirectEnd, domainLookupStart, domainLookupEnd,
domLoading, domContentLoadedEventStart, domContentLoadedEventEnd
and changed mediaWikiLoadComplete to mediaWikiLoadStart and
mediaWikiLoadEnd

Bug: T109756
Change-Id: I556ba997a68da7eea142c44dfd504a05aa130ca5
---
M modules/coal/files/coal
M modules/webperf/files/navtiming.py
2 files changed, 13 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/236024/1

diff --git a/modules/coal/files/coal b/modules/coal/files/coal
index db3d26b..00474da 100755
--- a/modules/coal/files/coal
+++ b/modules/coal/files/coal
@@ -45,20 +45,30 @@
 'connectEnd',
 'connectStart',
 'dnsLookup',
+'domainLookupStart',
+'domainLookupEnd'
 'domComplete',
+'domContentLoadedEventStart',
+'domContentLoadedEventEnd',
 'domInteractive',
+'domLoading',
 'fetchStart',
 'firstPaint',
 'loadEventEnd',
 'loadEventStart',
-'mediaWikiLoadComplete',
+'mediaWikiLoadStart',
+'mediaWikiLoadEnd',
 'redirectCount',
 'redirecting',
+'redirectStart',
+'redirectEnd',
 'requestStart',
 'responseEnd',
 'responseStart',
 'saveTiming',
 'secureConnectionStart',
+'unloadEventStart',
+'unloadEventEnd',
 )
 ARCHIVES = [(UPDATE_INTERVAL, RETENTION)]
 
diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
index 3688ac8..727b13d 100644
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -73,7 +73,8 @@
 for metric, marker in (
 ('dnsLookup', 'dnsLookup'),
 ('loading', 'loadEventStart'),
-('mediaWikiLoadComplete', 'mediaWikiLoadComplete'),
+('mediaWikiLoadStart', 'mediaWikiLoadStart'),
+('mediaWikiLoadEnd', 'mediaWikiLoadEnd'),
 ('redirecting', 'redirecting'),
 ('sending', 'fetchStart'),
 ('totalPageLoadTime', 'loadEventEnd'),

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

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

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

[MediaWiki-commits] [Gerrit] Configure $wgBabelCategoryNames for the Hebrew Wikipedia - change (operations/mediawiki-config)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Configure $wgBabelCategoryNames for the Hebrew Wikipedia
..

Configure $wgBabelCategoryNames for the Hebrew Wikipedia

The names are in English, and there are no categories for 0.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 900daec..7f40a56 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13551,6 +13551,15 @@
'5' => false,
'N' => 'Utilisateurs %code%-M',
),
+   'hewiki' => array(
+   '0' => false,
+   '1' => 'User %code%-1',
+   '2' => 'User %code%-2',
+   '3' => 'User %code%-3',
+   '4' => 'User %code%-4',
+   '5' => 'User %code%-5',
+   'N' => 'User %code%-N',
+   ),
'huwikiquote' => array( //T94842
'0' => 'User %code%-0',
'1' => 'User %code%-1',

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

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

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

[MediaWiki-commits] [Gerrit] 0.1.1-wmf2: support python-statsd >= 3.x - change (operations...nodepool)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: 0.1.1-wmf2: support python-statsd >= 3.x
..


0.1.1-wmf2: support python-statsd >= 3.x

Bug: T107268
Change-Id: I3f67cee2defe3e181415572c3e651e8e088f5b52
---
M debian/changelog
A debian/patches/0002-Debug-dying-task-managers.patch
A debian/patches/0003-Convert-to-use-latest-statsd-version.patch
A debian/patches/0004-Convert-timing-metrics-to-milliseconds.patch
M debian/patches/series
5 files changed, 269 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index f84dbae..d64805f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+nodepool (0.1.1-wmf2) jessie-wikimedia; urgency=medium
+
+  * Support python-statsd >= 3.x
+  * Patches:
+
+0002-Debug-dying-task-managers.patch
+[757d45b] Debug dying task managers
+Clark Boylan 
+
+0003-Convert-to-use-latest-statsd-version.patch
+[8e6b1b9] Convert to use latest statsd version
+Ian Wienand 
+
+0004-Convert-timing-metrics-to-milliseconds.patch
+[bd3c218] Convert timing metrics to milliseconds
+Timothy Chavez 
+
+ -- Antoine Musso   Thu, 03 Sep 2015 09:51:57 +
+
 nodepool (0.1.1-wmf1) jessie-wikimedia; urgency=medium
 
   * Bump to upstream 0.1.0
diff --git a/debian/patches/0002-Debug-dying-task-managers.patch 
b/debian/patches/0002-Debug-dying-task-managers.patch
new file mode 100644
index 000..50d9ca7
--- /dev/null
+++ b/debian/patches/0002-Debug-dying-task-managers.patch
@@ -0,0 +1,77 @@
+From: Clark Boylan 
+Date: Wed, 27 May 2015 09:50:55 -0700
+Subject: Debug dying task managers
+
+Change-Id: I81684026071b5abd6162e9f117e7fad08da61ea2
+---
+ nodepool/task_manager.py | 56 ++--
+ 1 file changed, 30 insertions(+), 26 deletions(-)
+
+diff --git a/nodepool/task_manager.py b/nodepool/task_manager.py
+index e48de1a..6e9cc95 100644
+--- a/nodepool/task_manager.py
 b/nodepool/task_manager.py
+@@ -79,33 +79,37 @@ class TaskManager(threading.Thread):
+ 
+ def run(self):
+ last_ts = 0
+-while True:
+-task = self.queue.get()
+-if not task:
+-if not self._running:
+-break
+-continue
++try:
+ while True:
+-delta = time.time() - last_ts
+-if delta >= self.rate:
+-break
+-time.sleep(self.rate - delta)
+-self.log.debug("Manager %s running task %s (queue: %s)" %
+-   (self.name, task, self.queue.qsize()))
+-start = time.time()
+-self.runTask(task)
+-last_ts = time.time()
+-dt = last_ts - start
+-self.log.debug("Manager %s ran task %s in %ss" %
+-   (self.name, task, dt))
+-if statsd:
+-#nodepool.task.PROVIDER.subkey
+-subkey = type(task).__name__
+-key = 'nodepool.task.%s.%s' % (self.name, subkey)
+-statsd.timing(key, dt)
+-statsd.incr(key)
+-
+-self.queue.task_done()
++task = self.queue.get()
++if not task:
++if not self._running:
++break
++continue
++while True:
++delta = time.time() - last_ts
++if delta >= self.rate:
++break
++time.sleep(self.rate - delta)
++self.log.debug("Manager %s running task %s (queue: %s)" %
++   (self.name, task, self.queue.qsize()))
++start = time.time()
++self.runTask(task)
++last_ts = time.time()
++dt = last_ts - start
++self.log.debug("Manager %s ran task %s in %ss" %
++   (self.name, task, dt))
++if statsd:
++#nodepool.task.PROVIDER.subkey
++subkey = type(task).__name__
++key = 'nodepool.task.%s.%s' % (self.name, subkey)
++statsd.timing(key, dt)
++statsd.incr(key)
++
++self.queue.task_done()
++except Exception:
++self.log.exception("Task manager died.")
++raise
+ 
+ def submitTask(self, task):
+ if not self._running:
diff --git a/debian/patches/0003-Convert-to-use-latest-statsd-version.patch 
b/debian/patches/0003-Convert-to-use-latest-statsd-version.patch
new file mode 100644
index 000..d28fc55
--- /dev/null
+++ 

[MediaWiki-commits] [Gerrit] Provide alternative access to citoid-template-type-map.json - change (mediawiki...Citoid)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Provide alternative access to citoid-template-type-map.json
..

Provide alternative access to citoid-template-type-map.json

This is a temporary workaround while we investigate the cause
of this bug.

Bug: T93800
Change-Id: Iccc4df3cc5c7e59010cf91b5a12343088f44b7ce
---
A CitoidDataModule.php
M extension.json
M modules/ve.ui.CiteFromIdInspectorTool.js
3 files changed, 62 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/28/236028/1

diff --git a/CitoidDataModule.php b/CitoidDataModule.php
new file mode 100644
index 000..efc2083
--- /dev/null
+++ b/CitoidDataModule.php
@@ -0,0 +1,49 @@
+ wfMessage( 'citoid-template-type-map.json' )->plain()
+   ),
+   ResourceLoader::inDebugMode()
+   ) . ');';
+   }
+
+   public function getDependencies( ResourceLoaderContext $context = null 
) {
+   return array(
+   'ext.visualEditor.base',
+   'ext.visualEditor.mediawiki',
+   );
+   }
+
+   public function getDefinitionSummary( ResourceLoaderContext $context ) {
+   $summary = parent::getDefinitionSummary( $context );
+   $summary[] = array(
+   'script' => $this->getScript( $context ),
+   );
+   return $summary;
+   }
+}
diff --git a/extension.json b/extension.json
index 11a502f..86c6de7 100644
--- a/extension.json
+++ b/extension.json
@@ -16,7 +16,8 @@
]
},
"AutoloadClasses": {
-   "CitoidHooks": "Citoid.hooks.php"
+   "CitoidHooks": "Citoid.hooks.php",
+   "CitoidDataModule": "CitoidDataModule.php"
},
"ResourceModules": {
"ext.citoid.visualEditor": {
@@ -36,7 +37,8 @@
"ext.visualEditor.mwreference",
"json",
"ext.visualEditor.mediawiki",
-   "mediawiki.api.options"
+   "mediawiki.api.options",
+   "ext.citoid.visualEditor.data"
],
"messages": [
"citoid-520-error",
@@ -60,6 +62,9 @@
"desktop",
"mobile"
]
+   },
+   "ext.citoid.visualEditor.data": {
+   "class": "CitoidDataModule"
}
},
"ResourceFileModulePaths": {
diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index e2bbdc8..2b7dd89 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -3,7 +3,12 @@
try {
JSON.parse( mw.message( 'citoid-template-type-map.json' 
).plain() );
} catch ( e ) {
-   return;
+   // Temporary hack for T93800
+   try {
+   JSON.parse( mw.message( 
'citoid-template-type-map-backup.json' ).plain() );
+   } catch ( e ) {
+   return;
+   }
}
 
// HACK: Find the position of the current citation toolbar definition

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccc4df3cc5c7e59010cf91b5a12343088f44b7ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
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] Remove etcd100X from manifests - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Remove etcd100X from manifests
..

Remove etcd100X from manifests

Shutdown for some time now, unused

Bug: T110030
Change-Id: Iaa4f21e247690bcb52d60f86899f121e36e40c74
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 0 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/236030/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9424680..99eb05d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -978,14 +978,6 @@
 }
 
 
-# Etcd distributed kv store
-node /^etcd100[1-3]\.eqiad\.wmnet$/ {
-include standard
-base::service_unit{ 'etcd':
-ensure  => absent,
-}
-}
-
 # Etherpad (virtual machine)
 node 'etherpad1001.eqiad.wmnet' {
 include base::firewall
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index fda3fd2..b9653cf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,6 @@
eeden|hooft|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
-   etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo 
partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 31cae90..b2e5961 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -55,27 +55,6 @@
fixed-address labsdb1003.eqiad.wmnet;
 }
 
-host etcd1001 {
-   hardware ethernet AA:00:00:68:8C:B4;
-   fixed-address etcd1001.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1002 {
-   hardware ethernet AA:00:00:44:DD:FE;
-   fixed-address etcd1002.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1003 {
-   hardware ethernet AA:00:00:C9:3E:BD;
-   fixed-address etcd1003.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host etherpad1001 {
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Introduce mendelevium to the cluster - change (operations/dns)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Introduce mendelevium to the cluster
..

Introduce mendelevium to the cluster

Used from ops OTRS Q1 2015 goal

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/33/236033/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index b85998f..a81f4e7 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -810,6 +810,7 @@
 171 1H IN PTR   ganeti1003.eqiad.wmnet.
 172 1H IN PTR   ganeti1004.eqiad.wmnet.
 173 1H IN PTR   ganeti01.svc.eqiad.wmnet.
+174 1H IN PTR   mendelevium.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 
 177 1H IN PTR   etherpad1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 178 1H IN PTR   restbase1008.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 054e255..4f0e057 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -760,6 +760,7 @@
 labvirt1009 1H  IN A10.64.20.15
 labvirt1007 1H  IN A10.64.20.16
 labvirt1008 1H  IN A10.64.20.17
+mendelevium 1H  IN A10.64.32.174 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 wdqs10011H  IN A10.64.48.112
 wdqs10021H  IN A10.64.32.183
 wtp1001 1H  IN A10.64.32.78

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd752dde5a37473ae7fc0b04473771d0d78d4ace
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Remove etcd100X from manifests - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Remove etcd100X from manifests
..


Remove etcd100X from manifests

Shutdown for some time now, unused

Bug: T110030
Change-Id: Iaa4f21e247690bcb52d60f86899f121e36e40c74
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 0 insertions(+), 30 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 683d55c..d9a6121 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -979,14 +979,6 @@
 }
 
 
-# Etcd distributed kv store
-node /^etcd100[1-3]\.eqiad\.wmnet$/ {
-include standard
-base::service_unit{ 'etcd':
-ensure  => absent,
-}
-}
-
 # Etherpad (virtual machine)
 node 'etherpad1001.eqiad.wmnet' {
 include base::firewall
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index fda3fd2..b9653cf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,6 @@
eeden|hooft|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
-   etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo 
partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 31cae90..b2e5961 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -55,27 +55,6 @@
fixed-address labsdb1003.eqiad.wmnet;
 }
 
-host etcd1001 {
-   hardware ethernet AA:00:00:68:8C:B4;
-   fixed-address etcd1001.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1002 {
-   hardware ethernet AA:00:00:44:DD:FE;
-   fixed-address etcd1002.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1003 {
-   hardware ethernet AA:00:00:C9:3E:BD;
-   fixed-address etcd1003.eqiad.wmnet;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host etherpad1001 {
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Move ebernhardson to analytics-privatedata-users - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Move ebernhardson to analytics-privatedata-users
..


Move ebernhardson to analytics-privatedata-users

Bug: T109356
Change-Id: I82a7b1222da9e2825162a7e70995563081aa3050
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f72fcc8..b8fa56d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -169,7 +169,7 @@
 members: [handrade, haithams, ezachte, milimetric, dartar, yurik,
   halfak, awight, dr0ptp4kt, tnegrin, nuria, leila,
   ironholds, kleduc, ellery, nettrom, mforns,
-  spage, bmansurov, rmoen, tbayer, joal, ashwinpp, ebernhardson,
+  spage, bmansurov, rmoen, tbayer, joal, ashwinpp,
   madhuvishy, tjones, legoktm, dcausse, bearloga]
   statistics-users:
 gid: 726
@@ -221,7 +221,7 @@
   ezachte, mforns, reedy, west1, phuedx, awight,
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
-  csteipp, smalyshev]
+  csteipp, smalyshev, ebernhardson]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

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

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

[MediaWiki-commits] [Gerrit] Quit validating that order_id is numeric - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Quit validating that order_id is numeric
..


Quit validating that order_id is numeric

The donor doesn't give this to us, and there's no reason it has
to be numeric.

Change-Id: I6fc899b394d10eaca8a00aafc96f256a21e8fdc0
---
M gateway_common/DataValidator.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php
index 0d3d576..f0b83fd 100644
--- a/gateway_common/DataValidator.php
+++ b/gateway_common/DataValidator.php
@@ -234,7 +234,6 @@
'gateway' => 'validate_alphanumeric',
'numAttempt' => 'validate_numeric',
'optout' => 'validate_boolean',
-   'order_id' => 'validate_numeric',
'posted' => 'validate_boolean',
'recurring' => 'validate_boolean',
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fc899b394d10eaca8a00aafc96f256a21e8fdc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: amazon
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Introduce mendelevium to the cluster - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Introduce mendelevium to the cluster
..

Introduce mendelevium to the cluster

TODO: Add the MAC address of the VM

Bug: T111532
Change-Id: I213a17c126b2f6e437a4adf6a7349d68e4fb682b
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/236035/1

diff --git a/manifests/site.pp b/manifests/site.pp
index d9a6121..feb414a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1770,6 +1770,16 @@
 salt::grain { 'debdeploy-memcached': value => 'true' }
 }
 
+# OTRS evaluation upgrade
+node 'mendelevium.eqiad.wmnet' {
+include base::firewall
+role otrs
+
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
+}
+
 # codfw deployment host (pending set up)
 node 'mira.codfw.wmnet' {
 
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index b9653cf..62b0440 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,7 @@
eeden|hooft|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
-   bromine|etherpad[12]001|fermium|krypton|planet1001) echo 
partman/flat.cfg virtual.cfg ;; \
+   bromine|etherpad[12]001|fermium|krypton|mendelevium|planet1001) 
echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index b2e5961..8bfc547 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -19,7 +19,7 @@
fixed-address analytics1010.eqiad.wmnet;
 }
 
-host bromine.eqaid.wmnet {
+host bromine.eqiad.wmnet {
hardware ethernet aa:00:00:f1:36:3a;
fixed-address bromine.eqiad.wmnet;
option pxelinux.pathprefix "jessie-installer/";
@@ -33,7 +33,7 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host krypton.eqaid.wmnet {
+host krypton.eqiad.wmnet {
hardware ethernet aa:00:00:7e:e0:22;
fixed-address krypton.eqiad.wmnet;
option pxelinux.pathprefix "jessie-installer/";
@@ -55,6 +55,13 @@
fixed-address labsdb1003.eqiad.wmnet;
 }
 
+host mendelevium.eqiad.wmnet {
+   hardware ethernet ; #TODO: Add this
+   fixed-address mendelevium.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host etherpad1001 {
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Back out "Re-use example surface across surface view tests" - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Back out "Re-use example surface across surface view tests"
..


Back out "Re-use example surface across surface view tests"

Back out 14a0f114de0eb9916785cdb560159279ea8d0e42 , as it can cause unit test
failures that are difficult to debug (e.g. failure when all tests are run, but
success when the failed test is re-run).

Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 5111d01..977fced 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -8,8 +8,6 @@
 
 /* Tests */
 
-ve.test.utils.exampleSurface = ve.test.utils.createSurfaceViewFromDocument( 
ve.dm.example.createExampleDocument() );
-
 ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, html, range, 
operations, expectedData, expectedSelection, msg ) {
var i, method, args, selection,
actions = {
@@ -22,7 +20,7 @@
},
view = html ?
ve.test.utils.createSurfaceViewFromHtml( html ) :
-   ve.test.utils.exampleSurface,
+   ve.test.utils.createSurfaceViewFromDocument( 
ve.dm.example.createExampleDocument() ),
model = view.getModel(),
data = ve.copy( model.getDocument().getFullData() );
 
@@ -44,13 +42,7 @@
 
assert.equalLinearData( model.getDocument().getFullData(), data, msg + 
': data' );
assert.deepEqual( selection.toJSON(), expectedSelection, msg + ': 
selection' );
-   if ( view === ve.test.utils.exampleSurface ) {
-   while ( model.hasBeenModified() ) {
-   model.undo();
-   }
-   } else {
-   view.destroy();
-   }
+   view.destroy();
 };
 
 QUnit.test( 'handleLinearDelete', function ( assert ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix download data link in footer - change (wikimedia/TransparencyReport)

[MSyed (Code Review)]

MSyed has submitted this change and it was merged.

Change subject: Fix download data link in footer
..


Fix download data link in footer

Change-Id: Id738e039953fb10bf76f40468483bcad6c478d46
---
M build/content.html
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/index.html
M build/fr/privacy.html
M build/fr/stories.html
M build/index.html
M build/privacy.html
M build/stories.html
M source/layouts/layout.erb
11 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/build/content.html b/build/content.html
index 2d3a9c1..ba581fd 100644
--- a/build/content.html
+++ b/build/content.html
@@ -493,7 +493,7 @@


Wiki 
Version
-   Download Data
+   Download Data
Privacy Policy
Data Retention 
Guidelines

diff --git a/build/faq.html b/build/faq.html
index 4d2d5c4..dfa9503 100644
--- a/build/faq.html
+++ b/build/faq.html
@@ -247,7 +247,7 @@


Wiki 
Version
-   Download Data
+   Download Data
Privacy Policy
Data Retention 
Guidelines

diff --git a/build/fr/content.html b/build/fr/content.html
index 00d9c12..adc3875 100644
--- a/build/fr/content.html
+++ b/build/fr/content.html
@@ -493,7 +493,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/faq.html b/build/fr/faq.html
index 2c988b8..6018d95 100644
--- a/build/fr/faq.html
+++ b/build/fr/faq.html
@@ -247,7 +247,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/index.html b/build/fr/index.html
index 4880922..e78ac8e 100644
--- a/build/fr/index.html
+++ b/build/fr/index.html
@@ -118,7 +118,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/privacy.html b/build/fr/privacy.html
index 82979f3..eff3104 100644
--- a/build/fr/privacy.html
+++ b/build/fr/privacy.html
@@ -391,7 +391,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/fr/stories.html b/build/fr/stories.html
index 744ca3c..f153e6a 100644
--- a/build/fr/stories.html
+++ b/build/fr/stories.html
@@ -271,7 +271,7 @@


Version
 Wiki
-   Téléchargements
+   Téléchargements
Politique de 
Confidentialité
Directives sur la 
Conservation des Données

diff --git a/build/index.html 

[MediaWiki-commits] [Gerrit] Release minor version 0.5.0 - change (mediawiki...api)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

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

Change subject: Release minor version 0.5.0
..

Release minor version 0.5.0

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


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

diff --git a/README.md b/README.md
index def359d..e45948f 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,11 @@
 
 ## Release notes
 
+### 0.5.0 2015-09-04
+- Client cookies can now be read and modified via MediawikiApi::Client#cookies.
+- Logging in will recurse only once upon a `NeedToken` API error to avoid
+  infinite recursion in cases where authentication is repeatedly unsuccessful.
+
 ### 0.4.1 2015-06-17
 - Allow for response-less ApiError exceptions to make mocking in tests easier
 
diff --git a/lib/mediawiki_api/version.rb b/lib/mediawiki_api/version.rb
index e8ea276..07a11a3 100644
--- a/lib/mediawiki_api/version.rb
+++ b/lib/mediawiki_api/version.rb
@@ -1,4 +1,4 @@
 # MediaWiki Ruby API
 module MediawikiApi
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Refactor insertion of survey panel - change (mediawiki...QuickSurveys)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Refactor insertion of survey panel
..

Hygiene: Refactor insertion of survey panel

Repurpose the function and document it so code is easier to follow.

Change-Id: I815fb8c8e450acc6b0f2778d437c905bcf86b663
---
M resources/ext.quicksurveys.init/init.js
1 file changed, 20 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/40/236040/1

diff --git a/resources/ext.quicksurveys.init/init.js 
b/resources/ext.quicksurveys.init/init.js
index a698763..5062ee1 100644
--- a/resources/ext.quicksurveys.init/init.js
+++ b/resources/ext.quicksurveys.init/init.js
@@ -1,5 +1,5 @@
 ( function ( $ ) {
-   var survey, $bodyContent, $place,
+   var survey,
$panel = $( '' ),
enabledSurveys = mw.config.get( 'wgEnabledQuickSurveys' ),
isMainPage = mw.config.get( 'wgIsMainPage' ),
@@ -22,6 +22,24 @@
} );
} else {
showSurvey();
+   }
+
+   /**
+* Insert the quick survey panel into the article either (in priority 
order)
+* before the first instance of a thumbnail,
+* before the first instance of a heading
+* or at the end of the article when no headings nor thumbnails exist
+* @param {jQuery.Object} $panel
+*/
+   function insertPanel( $panel ) {
+   var $bodyContent = $( '.mw-content-ltr, .mw-content-rtl' ),
+   $place = $bodyContent.find( '> .thumb, > h1, > h2, > 
h3, > h4, > h5, > h6' ).eq( 0 );
+
+   if ( $place.length ) {
+   $panel.insertBefore( $place );
+   } else {
+   $panel.appendTo( $bodyContent );
+   }
}
 
/**
@@ -52,14 +70,7 @@
if ( availableSurveys.length ) {
// Get a random available survey
survey = availableSurveys[ Math.floor( Math.random() * 
availableSurveys.length ) ];
-   $bodyContent = $( '.mw-content-ltr, .mw-content-rtl' );
-   $place = $bodyContent.find( '> .thumb, > h1, > h2, > 
h3, > h4, > h5, > h6' ).eq( 0 );
-
-   if ( $place.length ) {
-   $panel.insertBefore( $place );
-   } else {
-   $panel.appendTo( $bodyContent );
-   }
+   insertPanel( $panel );
// survey.module contains i18n messages
mw.loader.using( [ 'ext.quicksurveys.views', 
survey.module ] ).done( function () {
var panel,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I815fb8c8e450acc6b0f2778d437c905bcf86b663
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Add wmgBabelCategoryNames values for the Ladino Wikipedia - change (operations/mediawiki-config)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Add wmgBabelCategoryNames values for the Ladino Wikipedia
..

Add wmgBabelCategoryNames values for the Ladino Wikipedia

See the discussion at
https://translatewiki.net/wiki/Thread:User_talk:Amire80/Hebrew_script_in_Judeo-Spanish_%28Ladino%29_Wikipedia

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 900daec..7fbeec6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13677,6 +13677,15 @@
'5' => false,
'N' => 'Usores %code%-N',
),
+   'ladwiki' => array(
+   '0' => false,
+   '1' => 'User %code%-1',
+   '2' => 'User %code%-2',
+   '3' => 'User %code%-3',
+   '4' => 'User %code%-4',
+   '5' => 'User %code%-5',
+   'N' => 'User %code%-N',
+   ),
'minwiki' => array(
'0' => 'Pengguna %code%-0',
'1' => 'Pengguna %code%-1',

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

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

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

[MediaWiki-commits] [Gerrit] Correct bug in refine oozie job definition - change (analytics/refinery)

[Joal (Code Review)]

Joal has uploaded a new change for review.

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

Change subject: Correct bug in refine oozie job definition
..

Correct bug in refine oozie job definition

Change-Id: I79a6b792eae7b499bb9a125003e0a86ee3c2dd85
---
M oozie/webrequest/refine/workflow.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/27/236027/1

diff --git a/oozie/webrequest/refine/workflow.xml 
b/oozie/webrequest/refine/workflow.xml
index 4fa609e..4ab73a5 100644
--- a/oozie/webrequest/refine/workflow.xml
+++ b/oozie/webrequest/refine/workflow.xml
@@ -32,7 +32,7 @@
 
 
 refinery_jar_version
-Version of the refinery-hive jar file to import for 
UDFs
+Version of the refinery-hive jar file to import for 
UDFs
 
 
 artifacts_directory

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79a6b792eae7b499bb9a125003e0a86ee3c2dd85
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 

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

[MediaWiki-commits] [Gerrit] Remove id #colophon from print styles - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove id #colophon from print styles
..


Remove id #colophon from print styles

Have not found any place where this id is added to html

Change-Id: I4ac921be426d55b108eae443e3190be4c0c88018
---
M resources/src/mediawiki.legacy/commonPrint.css
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.legacy/commonPrint.css 
b/resources/src/mediawiki.legacy/commonPrint.css
index 2291572..2d41dc6 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -16,7 +16,6 @@
 .mw-jump,
 div.top,
 div#column-one,
-#colophon,
 .mw-editsection,
 .mw-editsection-like,
 .toctoggle,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac921be426d55b108eae443e3190be4c0c88018
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Repool es1002, es1016; Depool es1004 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool es1002, es1016; Depool es1004
..


Repool es1002, es1016; Depool es1004

Change-Id: I48ec0057741056ca1cf20e5abb0a4b04733c1673
References: T105843
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8559fba..d1cecff 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -14,11 +14,12 @@
 );
 
 $wmgOldExtTemplate = array(
-   '10.64.0.25'  => 1, # es1001
-#  '10.64.16.40' => 1, # es1002 (depool for maint)
-   '10.64.16.41' => 1, # es1003
-   '10.64.16.42' => 1, # es1004
-   '10.64.0.7'   => 1, # es1012
+   '10.64.0.25'   => 1, # es1001
+   '10.64.16.40'  => 1, # es1002
+   '10.64.16.41'  => 1, # es1003
+#  '10.64.16.42'  => 1, # es1004
+   '10.64.0.7'=> 1, # es1012
+   '10.64.32.185' => 1, # es1016
 );
 
 $wgLBFactoryConf = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48ec0057741056ca1cf20e5abb0a4b04733c1673
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
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] Move ebernhardson to analytics-privatedata-users - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Move ebernhardson to analytics-privatedata-users
..

Move ebernhardson to analytics-privatedata-users

Bug: T109356
Change-Id: I82a7b1222da9e2825162a7e70995563081aa3050
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f72fcc8..b8fa56d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -169,7 +169,7 @@
 members: [handrade, haithams, ezachte, milimetric, dartar, yurik,
   halfak, awight, dr0ptp4kt, tnegrin, nuria, leila,
   ironholds, kleduc, ellery, nettrom, mforns,
-  spage, bmansurov, rmoen, tbayer, joal, ashwinpp, ebernhardson,
+  spage, bmansurov, rmoen, tbayer, joal, ashwinpp,
   madhuvishy, tjones, legoktm, dcausse, bearloga]
   statistics-users:
 gid: 726
@@ -221,7 +221,7 @@
   ezachte, mforns, reedy, west1, phuedx, awight,
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
-  csteipp, smalyshev]
+  csteipp, smalyshev, ebernhardson]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

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

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

[MediaWiki-commits] [Gerrit] Fix failing tests due to change to desktop login form - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Fix failing tests due to change to desktop login form
..

Fix failing tests due to change to desktop login form

A few selectors need to be updated in light of the switch to using
the core login form.

See: I65e943b6dad8bfea994020f9f555bd095da1a171
Bug: T111489
Change-Id: I646c6878e64eba6846053b8e89e202a30485b1ed
---
M tests/browser/features/support/pages/special_userlogin_page.rb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/browser/features/support/pages/special_userlogin_page.rb 
b/tests/browser/features/support/pages/special_userlogin_page.rb
index 59ba3df..557d367 100644
--- a/tests/browser/features/support/pages/special_userlogin_page.rb
+++ b/tests/browser/features/support/pages/special_userlogin_page.rb
@@ -11,10 +11,10 @@
   text_field(:confirm_password, id: 'wpRetype')
   a(:login_wl, class: 'button')
   button(:signup_submit, id: 'wpCreateaccount')
-  a(:create_account_link, text: 'Create account')
+  a(:create_account_link, id:'mw-createaccount-join')
   div(:message_box, class: 'warningbox')
   div(:error_box, class: 'errorbox')
-  a(:password_reset, css: '.mw-userlogin-help')
+  a(:password_reset, title: 'Special:PasswordReset')
 
   # signup specific
   text_field(:confirmation_field, id: 'wpCaptchaWord')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I646c6878e64eba6846053b8e89e202a30485b1ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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] Remove invalid call to .showSourceSelector() - change (mediawiki...ContentTranslation)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Remove invalid call to .showSourceSelector()
..

Remove invalid call to .showSourceSelector()

This function doesn't exist since
Ie368d6657167fdaf7ffe32caf6bad220c836

It was replaced in that commit with .showDashboard().

However, it is better not to go to the dashboard here,
so that the user would see the error.

Bug: T111538
Change-Id: I750f3a9ec0ea0c74155c84b1a6c2c8a3091f8cd9
---
M modules/source/ext.cx.source.js
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 5861cdd..b2b27cb 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -76,7 +76,6 @@
mw.hook( 'mw.cx.error' ).fire(
mw.msg( 
'cx-error-page-not-found', title, $.uls.data.getAutonym( language ) )
);
-   cxSource.showSourceSelector();
} else {
mw.hook( 'mw.cx.error' ).fire( mw.msg( 
'cx-error-server-connection' ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] Remove double load of mediawiki.action.view.filepage - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Remove double load of mediawiki.action.view.filepage
..

Remove double load of mediawiki.action.view.filepage

To be merged 30 days after I8a0f0fecc53967bf2b0241ce92bbbd10b8fc704a is
deployed (should be 1.26wmf22)

Change-Id: I61d53080beceff2d8aac06c617035135557e4c47
---
M resources/Resources.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/236029/1

diff --git a/resources/Resources.php b/resources/Resources.php
index e056a27..16ddd61 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1757,8 +1757,6 @@
'styles' => array(
// @todo: Remove mediawiki.page.gallery when cache has 
cleared

'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 
'media' => 'print' ),
-   // @todo: Remove 
mediawiki.action.view.filepage.print.css when cache has cleared
-   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => 
array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' => 
array( 'media' => 'print' )
),
'group' => 'print',
@@ -1774,9 +1772,6 @@
'styles' => array(
// @todo: Remove when mediawiki.page.gallery in cached 
html.

'resources/src/mediawiki.page/mediawiki.page.gallery.css',
-   // @todo: Remove mediawiki.action.view.filepage.css
-   // and mediawiki.legacy/images/checker.png when cache 
has cleared
-   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
'resources/src/mediawiki.legacy/shared.css' => array( 
'media' => 'screen' )
),
),

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

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

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

[MediaWiki-commits] [Gerrit] Repool es1002, es1016; Depool es1004 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool es1002, es1016; Depool es1004
..

Repool es1002, es1016; Depool es1004

Change-Id: I48ec0057741056ca1cf20e5abb0a4b04733c1673
References: T105843
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8559fba..d1cecff 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -14,11 +14,12 @@
 );
 
 $wmgOldExtTemplate = array(
-   '10.64.0.25'  => 1, # es1001
-#  '10.64.16.40' => 1, # es1002 (depool for maint)
-   '10.64.16.41' => 1, # es1003
-   '10.64.16.42' => 1, # es1004
-   '10.64.0.7'   => 1, # es1012
+   '10.64.0.25'   => 1, # es1001
+   '10.64.16.40'  => 1, # es1002
+   '10.64.16.41'  => 1, # es1003
+#  '10.64.16.42'  => 1, # es1004
+   '10.64.0.7'=> 1, # es1012
+   '10.64.32.185' => 1, # es1016
 );
 
 $wgLBFactoryConf = array(

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

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

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

[MediaWiki-commits] [Gerrit] Document OutputPage::addVaryHeader() and fix uniques - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Document OutputPage::addVaryHeader() and fix uniques
..

Document OutputPage::addVaryHeader() and fix uniques

The $options parameter to OutputPage::addVaryHeader() is undocumented as
to what exactly is supposed to be passed to it. Fix that.

Also fix the fact that calling certain OutputPage methods can result in
duplication of values in the X-Vary-Options header.

Change-Id: I5fcbb8cf6219c6ab001962a4c2170e1733732426
---
M includes/OutputPage.php
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 073762a..09bce86 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2012,16 +2012,18 @@
 * Add an HTTP header that will influence on the cache
 *
 * @param string $header Header name
-* @param array|null $option
-* @todo FIXME: Document the $option parameter; it appears to be for
-*X-Vary-Options but what format is acceptable?
+* @param string[]|null $option Options for X-Vary-Options. Possible 
options are:
+*  - "string-contains=$XXX" varies on whether the header value as a 
string
+*contains $XXX as a substring.
+*  - "list-contains=$XXX" varies on whether the header value as a
+*comma-separated list contains $XXX as one of the list items.
 */
public function addVaryHeader( $header, $option = null ) {
if ( !array_key_exists( $header, $this->mVaryHeader ) ) {
$this->mVaryHeader[$header] = (array)$option;
} elseif ( is_array( $option ) ) {
if ( is_array( $this->mVaryHeader[$header] ) ) {
-   $this->mVaryHeader[$header] = array_merge( 
$this->mVaryHeader[$header], $option );
+   $this->mVaryHeader[$header] = array_unique( 
array_merge( $this->mVaryHeader[$header], $option ) );
} else {
$this->mVaryHeader[$header] = $option;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fcbb8cf6219c6ab001962a4c2170e1733732426
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] Add 'mediawiki.action.view.filepage' style module - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add 'mediawiki.action.view.filepage' style module
..


Add 'mediawiki.action.view.filepage' style module

Moved the style definition for a file page from shared.css to a new
module. Also for print styles.

Change-Id: I8a0f0fecc53967bf2b0241ce92bbbd10b8fc704a
---
M includes/page/ImagePage.php
M resources/Resources.php
R resources/src/mediawiki.action/images/checker.png
A resources/src/mediawiki.action/mediawiki.action.view.filepage.css
A resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/shared.css
7 files changed, 94 insertions(+), 68 deletions(-)

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



diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 4ec377a..62dd1e3 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -219,6 +219,9 @@
}
// always show the local local Filepage.css, bug 29277
$out->addModuleStyles( 'filepage' );
+
+   // Add MediaWiki styles for a file page
+   $out->addModuleStyles( 'mediawiki.action.view.filepage' );
}
 
/**
diff --git a/resources/Resources.php b/resources/Resources.php
index be06225..c4bfbdf 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1353,6 +1353,13 @@
'prefs-editing'
),
),
+   'mediawiki.action.view.filepage' => array(
+   'styles' => array(
+   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => 
array( 'media' => 'print' ),
+   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
+   ),
+   'position' => 'top',
+   ),
 
/* MediaWiki Language */
 
@@ -1742,6 +1749,8 @@
'styles' => array(
// @todo: Remove mediawiki.page.gallery when cache has 
cleared

'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 
'media' => 'print' ),
+   // @todo: Remove 
mediawiki.action.view.filepage.print.css when cache has cleared
+   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => 
array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' => 
array( 'media' => 'print' )
),
'group' => 'print',
@@ -1757,6 +1766,9 @@
'styles' => array(
// @todo: Remove when mediawiki.page.gallery in cached 
html.

'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+   // @todo: Remove mediawiki.action.view.filepage.css
+   // and mediawiki.legacy/images/checker.png when cache 
has cleared
+   
'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
'resources/src/mediawiki.legacy/shared.css' => array( 
'media' => 'screen' )
),
),
diff --git a/resources/src/mediawiki.legacy/images/checker.png 
b/resources/src/mediawiki.action/images/checker.png
similarity index 100%
rename from resources/src/mediawiki.legacy/images/checker.png
rename to resources/src/mediawiki.action/images/checker.png
Binary files differ
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css 
b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
new file mode 100644
index 000..bfc201a
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
@@ -0,0 +1,71 @@
+/*!
+ * File description page
+ */
+
+div.mw-filepage-resolutioninfo {
+   font-size: smaller;
+}
+
+/*
+ * File histories
+ */
+h2#filehistory {
+   clear: both;
+}
+
+table.filehistory th,
+table.filehistory td {
+   vertical-align: top;
+}
+
+table.filehistory th {
+   text-align: left;
+}
+
+table.filehistory td.mw-imagepage-filesize,
+table.filehistory th.mw-imagepage-filesize {
+   white-space: nowrap;
+}
+
+table.filehistory td.filehistory-selected {
+   font-weight: bold;
+}
+
+/*
+ * Add a checkered background image on hover for file
+ * description pages. (bug 26470)
+ */
+.filehistory a img,
+#file img:hover {
+   /* @embed */
+   background: white url(images/checker.png) repeat;
+}
+
+/*
+ * filetoc
+ */
+ul#filetoc {
+   text-align: center;
+   border: 1px solid #aa;
+   background-color: #f9f9f9;
+   padding: 5px;
+   font-size: 95%;
+   margin-bottom: 0.5em;
+   margin-left: 0;
+   margin-right: 0;
+}
+
+#filetoc li {
+   display: inline;
+   list-style-type: none;
+   padding-right: 2em;
+}

[MediaWiki-commits] [Gerrit] Remove etcd100X from DNS - change (operations/dns)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Remove etcd100X from DNS
..

Remove etcd100X from DNS

Also fix the SRV record for etcd1003 to conf1003

Bug: T110030
Change-Id: Idb5fbb0ec1c31dba5462e0332a99ef87f7a4b014
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/236031/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index f34271f..b85998f 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -810,9 +810,7 @@
 171 1H IN PTR   ganeti1003.eqiad.wmnet.
 172 1H IN PTR   ganeti1004.eqiad.wmnet.
 173 1H IN PTR   ganeti01.svc.eqiad.wmnet.
-174 1H IN PTR   etcd1001.eqiad.wmnet.
-175 1H IN PTR   etcd1002.eqiad.wmnet.
-176 1H IN PTR   etcd1003.eqiad.wmnet.
+
 177 1H IN PTR   etherpad1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 178 1H IN PTR   restbase1008.eqiad.wmnet.
 179 1H IN PTR   planet1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
diff --git a/templates/wmnet b/templates/wmnet
index a781310..054e255 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -72,9 +72,9 @@
 pgsql   5M  IN CNAMElabsdb1004.eqiad.wmnet.
 
 ; etcd records
-_etcd-server._tcp   5M  IN SRV  0 1 2380 etcd1003.eqiad.wmnet.
 _etcd-server._tcp   5M  IN SRV  0 1 2380 conf1001.eqiad.wmnet.
 _etcd-server._tcp   5M  IN SRV  0 1 2380 conf1002.eqiad.wmnet.
+_etcd-server._tcp   5M  IN SRV  0 1 2380 conf1003.eqiad.wmnet.
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1001.eqiad.wmnet.
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1002.eqiad.wmnet.
 _etcd._tcp  5M  IN SRV  0 1 2379 conf1003.eqiad.wmnet.
@@ -354,9 +354,6 @@
 es1017  1H  IN A10.64.48.114
 es1018  1H  IN A10.64.48.115
 es1019  1H  IN A10.64.48.116
-etcd10011H  IN A10.64.32.174
-etcd10021H  IN A10.64.32.175
-etcd10031H  IN A10.64.32.176
 etherpad10011H  IN A10.64.32.177 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 eventlog10011H  IN A10.64.32.167
 fluorine1H  IN A10.64.0.21

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb5fbb0ec1c31dba5462e0332a99ef87f7a4b014
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Move print rule for .mw-metadata-show-hide-extended - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move print rule for .mw-metadata-show-hide-extended
..


Move print rule for .mw-metadata-show-hide-extended

The class mw-metadata-show-hide-extended gets hidden on print in the
commonPrint.css, moved to module with a @media rule to avoid a new file
for just one rule.

Change-Id: I4a40225febe4da6e41435cb5190fc55f8f8a3963
---
M resources/src/mediawiki.action/mediawiki.action.view.metadata.css
M resources/src/mediawiki.legacy/commonPrint.css
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index 9f786ec..b07965e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -14,3 +14,9 @@
-ms-user-select: none;
user-select: none;
 }
+
+@media print {
+   tr.mw-metadata-show-hide-extended {
+   display: none;
+   }
+}
diff --git a/resources/src/mediawiki.legacy/commonPrint.css 
b/resources/src/mediawiki.legacy/commonPrint.css
index 933a0e8..e1b3198 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -28,7 +28,6 @@
 li#privacy,
 #footer-places,
 .mw-hidden-catlinks,
-tr.mw-metadata-show-hide-extended,
 .usermessage,
 .patrollink,
 .ns-0 .mw-redirectedfrom,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a40225febe4da6e41435cb5190fc55f8f8a3963
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

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

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: varnish: lint fixes
..


varnish: lint fixes

"indentation of => is not properly aligned"
"double quoted string containing no variables"

fixes more puppet-lint warnings
for T93645

Change-Id: I86c85bb2ac239d7c379db2375f03f7fb0d97d2b5
---
M modules/varnish/manifests/common.pp
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
M modules/varnish/manifests/zero_update.pp
5 files changed, 35 insertions(+), 33 deletions(-)

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



diff --git a/modules/varnish/manifests/common.pp 
b/modules/varnish/manifests/common.pp
index d221210..83d5982 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -18,19 +18,19 @@
 }
 
 file { '/usr/share/varnish/reload-vcl':
-source  => 'puppet:///modules/varnish/reload-vcl',
-owner   => 'root',
-group   => 'root',
-mode=> '0555',
+source => 'puppet:///modules/varnish/reload-vcl',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
 }
 
 # `vlogdump` is a small tool to filter the output of varnishlog
 # See  for more.
 file { '/usr/local/bin/vlogdump':
-source  => 'puppet:///modules/varnish/vlogdump',
-owner   => 'root',
-group   => 'root',
-mode=> '0555',
+source => 'puppet:///modules/varnish/vlogdump',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
 }
 
 file { '/usr/local/lib/python2.7/dist-packages/varnishlog.py':
diff --git a/modules/varnish/manifests/common/vcl.pp 
b/modules/varnish/manifests/common/vcl.pp
index 69b0696..41f63bd 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -42,10 +42,10 @@
 }
 
 file { '/etc/varnish/hhvm.inc.vcl':
-ensure  => absent,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
+ensure => absent,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
 }
 
 # VCL unit tests
diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index edf4915..aa9af9b 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -99,10 +99,10 @@
 }
 
 base::service_unit { "varnish${instancesuffix}":
-template_name => 'varnish',
-systemd => true,
-sysvinit => true,
-refresh => false,
+template_name  => 'varnish',
+systemd=> true,
+sysvinit   => true,
+refresh=> false,
 service_params => {
 tag => 'varnish_instance',
 enable  => true,
@@ -143,10 +143,10 @@
 }
 
 exec { "retry-load-new-vcl-file${instancesuffix}":
-require => Exec["load-new-vcl-file${instancesuffix}"],
-command => "/usr/share/varnish/reload-vcl ${extraopts} && (rm 
${vcl_failed_file}; true)",
-onlyif  => "test -f ${vcl_failed_file}",
-path=> '/bin:/usr/bin',
+require => Exec["load-new-vcl-file${instancesuffix}"],
+command => "/usr/share/varnish/reload-vcl ${extraopts} && (rm 
${vcl_failed_file}; true)",
+onlyif  => "test -f ${vcl_failed_file}",
+path=> '/bin:/usr/bin',
 }
 
 monitoring::service { "varnish http ${title}":
diff --git a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp 
b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
index 8154651..caab4e8 100644
--- a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
+++ b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
@@ -1,10 +1,10 @@
 class varnish::monitoring::ganglia::vhtcpd {
 file { '/usr/lib/ganglia/python_modules/vhtcpd.py':
-source  => 
"puppet:///modules/${module_name}/ganglia/ganglia-vhtcpd.py",
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-notify  => Service['ganglia-monitor'],
+source => 
"puppet:///modules/${module_name}/ganglia/ganglia-vhtcpd.py",
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+notify => Service['ganglia-monitor'],
 }
 file { '/etc/ganglia/conf.d/vhtcpd.pyconf':
 owner   => 'root',
diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index f5b4f14..72709b3 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -26,14 +26,16 @@
 class varnish::zero_update($site, $auth_content, $hour = '*', $minute = '*/5') 
{
 require 'varnish::netmapper_update_common'